← Back to branch summary

~vanvugt/mir/fix-1226139

« back to all changes in this revision

Viewing changes to tests/unit-tests/frontend/test_session_mediator.cpp

  • Committer: Tarmac
  • Author(s): Robert Carr, Daniel van Vugt
  • Date: 2013-09-06 22:35:09 UTC
  • mfrom: (985.4.17 dpms-support-api)
  • Revision ID: tarmac-20130906223509-70pwrb4hkfnz2ary
Add DPMS configuration API. Fixes: https://bugs.launchpad.net/bugs/1193222.

Approved by PS Jenkins bot, Alan Griffiths, Robert Ancell.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/frontend/test_session_mediator.cpp
82
82
{
83
83
    MOCK_CONST_METHOD1(for_each_card, void(std::function<void(mg::DisplayConfigurationCard const&)>));
84
84
    MOCK_CONST_METHOD1(for_each_output, void(std::function<void(mg::DisplayConfigurationOutput const&)>));
85
 
    MOCK_METHOD4(configure_output, void(mg::DisplayConfigurationOutputId, bool, geom::Point, size_t));
 
85
    MOCK_METHOD5(configure_output, void(mg::DisplayConfigurationOutputId, bool, geom::Point, size_t, MirPowerMode));
86
86
};
87
87
 
88
88
}
567
567
    EXPECT_CALL(*mock_display_selector, active_configuration())
568
568
        .InSequence(seq)
569
569
        .WillOnce(Return(mt::fake_shared(mock_display_config))); 
570
 
    EXPECT_CALL(mock_display_config, configure_output(id0, used0, pt0, mode_index0))
 
570
    EXPECT_CALL(mock_display_config, configure_output(id0, used0, pt0, mode_index0,  mir_power_mode_on))
571
571
        .InSequence(seq);
572
 
    EXPECT_CALL(mock_display_config, configure_output(id1, used1, pt1, mode_index1))
 
572
    EXPECT_CALL(mock_display_config, configure_output(id1, used1, pt1, mode_index1, mir_power_mode_off))
573
573
        .InSequence(seq);
574
574
    EXPECT_CALL(*mock_display_selector, configure(_,_))
575
575
        .InSequence(seq);
591
591
    disp0->set_position_x(pt0.x.as_uint32_t());
592
592
    disp0->set_position_y(pt0.y.as_uint32_t());
593
593
    disp0->set_current_mode(mode_index0);
 
594
    disp0->set_power_mode(static_cast<uint32_t>(mir_power_mode_on));
594
595
 
595
596
    auto disp1 = configuration.add_display_output();
596
597
    disp1->set_output_id(id1.as_value());
598
599
    disp1->set_position_x(pt1.x.as_uint32_t());
599
600
    disp1->set_position_y(pt1.y.as_uint32_t());
600
601
    disp1->set_current_mode(mode_index1);
 
602
    disp1->set_power_mode(static_cast<uint32_t>(mir_power_mode_off));
601
603
 
602
604
    session_mediator.configure_display(nullptr, &configuration,
603
605
                                       &configuration_response, null_callback.get());