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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/projecting_observer_chromeos_unittest.cc

Issue 187073002: Refactoring display configuration state to allow generic state objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« ash/display/display_change_observer_chromeos.cc ('K') | « ash/display/projecting_observer_chromeos.cc ('k') | ash/touch/touch_observer_hud.h » ('j') | chromeos/chromeos.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/projecting_observer_chromeos_unittest.cc
diff --git a/ash/display/projecting_observer_chromeos_unittest.cc b/ash/display/projecting_observer_chromeos_unittest.cc
index 31a627d7c31b4c2086593e1826a45eb131077e93..a1d70b48d48d65ca3c27b7a4cb8982cea6fa4d06 100644
--- a/ash/display/projecting_observer_chromeos_unittest.cc
+++ b/ash/display/projecting_observer_chromeos_unittest.cc
@@ -4,9 +4,11 @@
#include "ash/display/projecting_observer_chromeos.h"
+#include "base/memory/scoped_vector.h"
#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/dbus/fake_power_manager_client.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/chromeos/test/test_display_snapshot.h"
namespace ash {
@@ -14,18 +16,30 @@ namespace internal {
namespace {
-chromeos::OutputConfigurator::OutputSnapshot CreateInternalSnapshot() {
- chromeos::OutputConfigurator::OutputSnapshot output;
- output.type = ui::OUTPUT_TYPE_INTERNAL;
+ui::TestDisplaySnapshot* CreateInternalSnapshot() {
+ ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
+ output->set_type(ui::OUTPUT_TYPE_INTERNAL);
return output;
}
-chromeos::OutputConfigurator::OutputSnapshot CreateVGASnapshot() {
- chromeos::OutputConfigurator::OutputSnapshot output;
- output.type = ui::OUTPUT_TYPE_VGA;
+ui::TestDisplaySnapshot* CreateVGASnapshot() {
+ ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
+ output->set_type(ui::OUTPUT_TYPE_VGA);
return output;
}
+std::vector<chromeos::OutputConfigurator::InternalDisplayState> CreateOutputs(
+ const ScopedVector<ui::TestDisplaySnapshot>& displays) {
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs;
+ for (size_t i = 0; i < displays.size(); ++i) {
+ chromeos::OutputConfigurator::InternalDisplayState state;
+ state.display = displays[i];
+ outputs.push_back(state);
+ }
+
+ return outputs;
+}
+
class ProjectingObserverTest : public testing::Test {
public:
ProjectingObserverTest() : observer_(new ProjectingObserver()) {
@@ -54,7 +68,9 @@ class ProjectingObserverTest : public testing::Test {
} // namespace
TEST_F(ProjectingObserverTest, CheckNoDisplay) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -62,8 +78,10 @@ TEST_F(ProjectingObserverTest, CheckNoDisplay) {
}
TEST_F(ProjectingObserverTest, CheckWithoutInternalDisplay) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateVGASnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateVGASnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -71,8 +89,10 @@ TEST_F(ProjectingObserverTest, CheckWithoutInternalDisplay) {
}
TEST_F(ProjectingObserverTest, CheckWithInternalDisplay) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateInternalSnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateInternalSnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -80,9 +100,11 @@ TEST_F(ProjectingObserverTest, CheckWithInternalDisplay) {
}
TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateVGASnapshot());
- outputs.push_back(CreateVGASnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateVGASnapshot());
+ displays.push_back(CreateVGASnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -91,9 +113,11 @@ TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
}
TEST_F(ProjectingObserverTest, CheckWithInternalAndVGADisplays) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateInternalSnapshot());
- outputs.push_back(CreateVGASnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateInternalSnapshot());
+ displays.push_back(CreateVGASnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -101,8 +125,10 @@ TEST_F(ProjectingObserverTest, CheckWithInternalAndVGADisplays) {
}
TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateVGASnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateVGASnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
observer_->OnCastingSessionStartedOrStopped(true);
@@ -113,8 +139,10 @@ TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
}
TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateInternalSnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateInternalSnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
observer_->OnCastingSessionStartedOrStopped(true);
@@ -124,8 +152,10 @@ TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
}
TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateInternalSnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateInternalSnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
observer_->OnCastingSessionStartedOrStopped(true);
@@ -142,8 +172,10 @@ TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
TEST_F(ProjectingObserverTest,
CheckStopProjectingAfterClosingAllCastingSessions) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateInternalSnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateInternalSnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
observer_->OnCastingSessionStartedOrStopped(true);
@@ -155,9 +187,11 @@ TEST_F(ProjectingObserverTest,
TEST_F(ProjectingObserverTest,
CheckStopProjectingAfterDisconnectingSecondOutput) {
- std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
- outputs.push_back(CreateInternalSnapshot());
- outputs.push_back(CreateVGASnapshot());
+ ScopedVector<ui::TestDisplaySnapshot> displays;
+ displays.push_back(CreateInternalSnapshot());
+ displays.push_back(CreateVGASnapshot());
+ std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+ CreateOutputs(displays);
observer_->OnDisplayModeChanged(outputs);
// Remove VGA output.
« ash/display/display_change_observer_chromeos.cc ('K') | « ash/display/projecting_observer_chromeos.cc ('k') | ash/touch/touch_observer_hud.h » ('j') | chromeos/chromeos.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698