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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/display/output_configurator_unittest.cc

Issue 22875019: chromeos: Notify observers after display power changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make NotifyObservers take a success argument Created 7 years, 4 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
« chromeos/display/output_configurator.cc ('K') | « chromeos/display/output_configurator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/display/output_configurator_unittest.cc
diff --git a/chromeos/display/output_configurator_unittest.cc b/chromeos/display/output_configurator_unittest.cc
index 0749399af882a094c92e719c82017740865c5c5e..2e3fbffff2dee5c9851ef568f0873101618199dc 100644
--- a/chromeos/display/output_configurator_unittest.cc
+++ b/chromeos/display/output_configurator_unittest.cc
@@ -192,6 +192,57 @@ class TestDelegate : public OutputConfigurator::Delegate {
DISALLOW_COPY_AND_ASSIGN(TestDelegate);
};
+class TestObserver : public OutputConfigurator::Observer {
+ public:
+ explicit TestObserver(OutputConfigurator* configurator)
+ : configurator_(configurator) {
+ Reset();
+ configurator_->AddObserver(this);
+ }
+ ~TestObserver() {
oshima 2013/08/16 16:19:14 virtual
Daniel Erat 2013/08/16 16:42:16 Done.
+ configurator_->RemoveObserver(this);
+ }
+
+ int num_changes() const { return num_changes_; }
+ int num_failures() const { return num_failures_; }
+ std::vector<OutputConfigurator::OutputSnapshot> latest_outputs() const {
+ return latest_outputs_;
+ }
+ OutputState latest_failed_state() const { return latest_failed_state_; }
+
+ void Reset() {
+ num_changes_ = 0;
+ num_failures_ = 0;
+ latest_outputs_.clear();
+ latest_failed_state_ = STATE_INVALID;
+ }
+
+ // OutputConfigurator::Observer overrides:
+ virtual void OnDisplayModeChanged(
+ const std::vector<OutputConfigurator::OutputSnapshot>& outputs) OVERRIDE {
+ num_changes_++;
+ latest_outputs_ = outputs;
+ }
+
+ virtual void OnDisplayModeChangeFailed(OutputState failed_new_state) {
oshima 2013/08/16 16:19:14 OVERRIDE
Daniel Erat 2013/08/16 16:42:16 Done.
+ num_failures_++;
+ latest_failed_state_ = failed_new_state;
+ }
+
+ private:
+ OutputConfigurator* configurator_; // Not owned.
+
+ // Number of times that OnDisplayMode*() has been called.
+ int num_changes_;
+ int num_failures_;
+
+ // Parameters most recently passed to OnDisplayMode*().
+ std::vector<OutputConfigurator::OutputSnapshot> latest_outputs_;
+ OutputState latest_failed_state_;
+
+ DISALLOW_COPY_AND_ASSIGN(TestObserver);
+};
+
class TestStateController : public OutputConfigurator::StateController {
public:
TestStateController() : state_(STATE_DUAL_EXTENDED) {}
@@ -238,7 +289,8 @@ class TestMirroringController
class OutputConfiguratorTest : public testing::Test {
public:
OutputConfiguratorTest()
- : test_api_(&configurator_, TestDelegate::kXRandREventBase) {}
+ : observer_(&configurator_),
+ test_api_(&configurator_, TestDelegate::kXRandREventBase) {}
virtual ~OutputConfiguratorTest() {}
virtual void SetUp() OVERRIDE {
@@ -347,6 +399,7 @@ class OutputConfiguratorTest : public testing::Test {
TestStateController state_controller_;
TestMirroringController mirroring_controller_;
OutputConfigurator configurator_;
+ TestObserver observer_;
TestDelegate* delegate_; // not owned
OutputConfigurator::TestApi test_api_;
@@ -363,6 +416,7 @@ TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
// Connect a second output and check that the configurator enters
// extended mode.
+ observer_.Reset();
state_controller_.set_state(STATE_DUAL_EXTENDED);
UpdateOutputs(2, true);
const int kDualHeight =
@@ -378,7 +432,9 @@ TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
kUngrab, kProjectingOn, NULL),
delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
+ observer_.Reset();
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
EXPECT_EQ(JoinActions(kGrab,
GetFramebufferAction(kSmallModeWidth, kSmallModeHeight,
@@ -390,8 +446,10 @@ TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
kUngrab, NULL),
delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Disconnect the second output.
+ observer_.Reset();
UpdateOutputs(1, true);
EXPECT_EQ(JoinActions(kUpdateXRandR, kGrab,
GetFramebufferAction(kSmallModeWidth, kSmallModeHeight,
@@ -401,6 +459,7 @@ TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
kUngrab, kProjectingOff, NULL),
delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Software Mirroring
DisableNativeMirroring();
@@ -418,25 +477,31 @@ TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ observer_.Reset();
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
- EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL),
- delegate_->GetActionsAndClear());
+ EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
EXPECT_TRUE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
- // Setting STATE_DUAL_MIRROR should try to reconfigure
+ // Setting STATE_DUAL_MIRROR should try to reconfigure.
+ observer_.Reset();
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_EXTENDED));
EXPECT_EQ(JoinActions(NULL), delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Set back to software mirror mode.
+ observer_.Reset();
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL),
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
EXPECT_TRUE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Disconnect the second output.
+ observer_.Reset();
UpdateOutputs(1, true);
EXPECT_EQ(JoinActions(kUpdateXRandR, kGrab,
GetFramebufferAction(kSmallModeWidth, kSmallModeHeight,
@@ -446,12 +511,14 @@ TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
kUngrab, kProjectingOff, NULL),
delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
}
TEST_F(OutputConfiguratorTest, SetDisplayPower) {
InitWithSingleOutput();
state_controller_.set_state(STATE_DUAL_MIRROR);
+ observer_.Reset();
UpdateOutputs(2, true);
EXPECT_EQ(JoinActions(kUpdateXRandR, kGrab,
GetFramebufferAction(kSmallModeWidth, kSmallModeHeight,
@@ -463,9 +530,11 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
kUngrab, kProjectingOn, NULL),
delegate_->GetActionsAndClear());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Turning off the internal display should switch the external display to
// its native mode.
+ observer_.Reset();
configurator_.SetDisplayPower(DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON,
OutputConfigurator::kSetDisplayPowerNoFlags);
EXPECT_EQ(JoinActions(kGrab,
@@ -478,9 +547,11 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
kForceDPMS, kUngrab, NULL),
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_SINGLE, configurator_.output_state());
+ EXPECT_EQ(1, observer_.num_changes());
// When all displays are turned off, the framebuffer should switch back
// to the mirrored size.
+ observer_.Reset();
configurator_.SetDisplayPower(DISPLAY_POWER_ALL_OFF,
OutputConfigurator::kSetDisplayPowerNoFlags);
EXPECT_EQ(JoinActions(kGrab,
@@ -494,8 +565,10 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_MIRROR, configurator_.output_state());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Turn all displays on and check that mirroring is still used.
+ observer_.Reset();
configurator_.SetDisplayPower(DISPLAY_POWER_ALL_ON,
OutputConfigurator::kSetDisplayPowerNoFlags);
EXPECT_EQ(JoinActions(kGrab,
@@ -509,10 +582,12 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_MIRROR, configurator_.output_state());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Software Mirroring
DisableNativeMirroring();
state_controller_.set_state(STATE_DUAL_MIRROR);
+ observer_.Reset();
UpdateOutputs(2, true);
const int kDualHeight =
kSmallModeHeight + OutputConfigurator::kVerticalGap + kBigModeHeight;
@@ -528,9 +603,11 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
EXPECT_TRUE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Turning off the internal display should switch the external display to
// its native mode.
+ observer_.Reset();
configurator_.SetDisplayPower(DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON,
OutputConfigurator::kSetDisplayPowerNoFlags);
EXPECT_EQ(JoinActions(kGrab,
@@ -544,9 +621,11 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_SINGLE, configurator_.output_state());
EXPECT_FALSE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// When all displays are turned off, the framebuffer should switch back
// to the extended + software mirroring.
+ observer_.Reset();
configurator_.SetDisplayPower(DISPLAY_POWER_ALL_OFF,
OutputConfigurator::kSetDisplayPowerNoFlags);
EXPECT_EQ(JoinActions(kGrab,
@@ -561,8 +640,10 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
EXPECT_TRUE(mirroring_controller_.software_mirroring_enabled());
+ EXPECT_EQ(1, observer_.num_changes());
// Turn all displays on and check that mirroring is still used.
+ observer_.Reset();
configurator_.SetDisplayPower(DISPLAY_POWER_ALL_ON,
OutputConfigurator::kSetDisplayPowerNoFlags);
EXPECT_EQ(JoinActions(kGrab,
@@ -577,7 +658,7 @@ TEST_F(OutputConfiguratorTest, SetDisplayPower) {
delegate_->GetActionsAndClear());
EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
EXPECT_TRUE(mirroring_controller_.software_mirroring_enabled());
-
+ EXPECT_EQ(1, observer_.num_changes());
}
TEST_F(OutputConfiguratorTest, SuspendAndResume) {
@@ -726,23 +807,32 @@ TEST_F(OutputConfiguratorTest, InvalidOutputStates) {
EXPECT_EQ(kNoActions, delegate_->GetActionsAndClear());
configurator_.Init(false);
configurator_.Start(0);
+ observer_.Reset();
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_HEADLESS));
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_SINGLE));
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_DUAL_EXTENDED));
+ EXPECT_EQ(1, observer_.num_changes());
+ EXPECT_EQ(3, observer_.num_failures());
UpdateOutputs(1, true);
+ observer_.Reset();
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_HEADLESS));
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_SINGLE));
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_DUAL_EXTENDED));
+ EXPECT_EQ(1, observer_.num_changes());
+ EXPECT_EQ(3, observer_.num_failures());
state_controller_.set_state(STATE_DUAL_EXTENDED);
UpdateOutputs(2, true);
+ observer_.Reset();
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_HEADLESS));
EXPECT_FALSE(configurator_.SetDisplayMode(STATE_SINGLE));
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_EXTENDED));
+ EXPECT_EQ(2, observer_.num_changes());
+ EXPECT_EQ(2, observer_.num_failures());
}
TEST_F(OutputConfiguratorTest, GetOutputStateForDisplaysWithoutId) {
« chromeos/display/output_configurator.cc ('K') | « chromeos/display/output_configurator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698