← Back to branch summary

~vanvugt/mir/simplify-DisplayReport

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp

  • Committer: Daniel van Vugt
  • Date: 2013-12-19 07:56:16 UTC
  • Revision ID: daniel.van.vugt@canonical.com-20131219075616-xvm4kt4pg8c0be3z
Initial attempt at simplifying DisplayReport

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp
430
430
    set_up_expectations_for_switch_handler(SIGUSR1);
431
431
 
432
432
    /* First switch away attempt */
433
 
    EXPECT_CALL(mock_report, report_vt_switch_away_failure());
 
433
    EXPECT_CALL(mock_report,
 
434
                report_success(false, StrEq("switch away from Mir VT")));
434
435
    EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, VT_RELDISP,
435
436
                                 MatcherCast<int>(disallow_switch)));
436
437
 
437
438
    /* Second switch away attempt */
438
 
    EXPECT_CALL(mock_report, report_vt_switch_away_failure());
 
439
    EXPECT_CALL(mock_report,
 
440
                report_success(false, StrEq("switch away from Mir VT")));
439
441
    EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, VT_RELDISP,
440
442
                                 MatcherCast<int>(disallow_switch)));
441
443
 
472
474
    EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, VT_RELDISP, allow_switch));
473
475
 
474
476
    /* Switch back */
475
 
    EXPECT_CALL(mock_report, report_vt_switch_back_failure());
 
477
    EXPECT_CALL(mock_report,
 
478
                report_success(false, StrEq("switch back to Mir VT")));
476
479
    EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, VT_RELDISP, VT_ACKACQ));
477
480
 
478
481
    set_up_expectations_for_vt_teardown();