← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-02-04 14:49:07 UTC
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: package-import@ubuntu.com-20140204144907-o3ruhix0ey26lchl
Tags: upstream-0.1.4+14.04.20140204
Import upstream version 0.1.4+14.04.20140204

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/frontend/test_session_mediator.cpp
83
83
{
84
84
    MOCK_CONST_METHOD1(for_each_card, void(std::function<void(mg::DisplayConfigurationCard const&)>));
85
85
    MOCK_CONST_METHOD1(for_each_output, void(std::function<void(mg::DisplayConfigurationOutput const&)>));
86
 
    MOCK_METHOD5(configure_output, void(mg::DisplayConfigurationOutputId, bool, geom::Point, size_t, MirPowerMode));
 
86
    MOCK_METHOD7(configure_output, void(mg::DisplayConfigurationOutputId, bool, geom::Point, size_t, MirPixelFormat, MirPowerMode, MirOrientation));
87
87
};
88
88
 
89
89
}
555
555
    bool used0 = false, used1 = true;
556
556
    geom::Point pt0{44,22}, pt1{3,2};
557
557
    size_t mode_index0 = 1, mode_index1 = 3;
 
558
    MirPixelFormat format0{mir_pixel_format_invalid};
 
559
    MirPixelFormat format1{mir_pixel_format_argb_8888};
558
560
    mg::DisplayConfigurationOutputId id0{6}, id1{3};
559
561
 
560
562
    NiceMock<MockConfig> mock_display_config;
568
570
    EXPECT_CALL(*mock_display_selector, active_configuration())
569
571
        .InSequence(seq)
570
572
        .WillOnce(Return(mt::fake_shared(mock_display_config)));
571
 
    EXPECT_CALL(mock_display_config, configure_output(id0, used0, pt0, mode_index0,  mir_power_mode_on))
 
573
    EXPECT_CALL(mock_display_config,
 
574
                configure_output(id0, used0, pt0, mode_index0, format0,
 
575
                                 mir_power_mode_on, mir_orientation_left))
572
576
        .InSequence(seq);
573
 
    EXPECT_CALL(mock_display_config, configure_output(id1, used1, pt1, mode_index1, mir_power_mode_off))
 
577
    EXPECT_CALL(mock_display_config,
 
578
                configure_output(id1, used1, pt1, mode_index1, format1,
 
579
                                 mir_power_mode_off, mir_orientation_inverted))
574
580
        .InSequence(seq);
575
581
    EXPECT_CALL(*mock_display_selector, configure(_,_))
576
582
        .InSequence(seq);
593
599
    disp0->set_position_x(pt0.x.as_uint32_t());
594
600
    disp0->set_position_y(pt0.y.as_uint32_t());
595
601
    disp0->set_current_mode(mode_index0);
 
602
    disp0->set_current_format(format0);
596
603
    disp0->set_power_mode(static_cast<uint32_t>(mir_power_mode_on));
 
604
    disp0->set_orientation(mir_orientation_left);
597
605
 
598
606
    auto disp1 = configuration.add_display_output();
599
607
    disp1->set_output_id(id1.as_value());
601
609
    disp1->set_position_x(pt1.x.as_uint32_t());
602
610
    disp1->set_position_y(pt1.y.as_uint32_t());
603
611
    disp1->set_current_mode(mode_index1);
 
612
    disp1->set_current_format(format1);
604
613
    disp1->set_power_mode(static_cast<uint32_t>(mir_power_mode_off));
 
614
    disp1->set_orientation(mir_orientation_inverted);
605
615
 
606
616
    session_mediator.configure_display(nullptr, &configuration,
607
617
                                       &configuration_response, null_callback.get());