Merge lp:~albaguirre/unity-system-compositor/mock-implement-new-display-method into lp:unity-system-compositor

[Alberto Aguirre]

mocks: Implement new method added to mir::graphics::Display

lp:mir mir::grahpics::Display interface has a new method.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/341/rebuild

review: Approve (continuous-integration)

Unmerged revisions

275. By Alberto Aguirre on 2016-02-03

mocks: Implement new method added to mir::graphics::Display

=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h	2015-11-12 12:28:17 +0000
+++ tests/include/usc/test/mock_display.h	2016-02-03 23:01:27 +0000
@@ -20,6 +20,7 @@
 #include "usc/test/stub_display_configuration.h"
 
 #include <mir/graphics/display.h>
+#include <mir/graphics/virtual_output.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -60,6 +61,9 @@
 
     std::unique_ptr<mir::graphics::GLContext> create_gl_context() override
     { return std::unique_ptr<mir::graphics::GLContext>{};};
+
+    std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int,int) override
+    { return nullptr; }
 };
 }
 }