← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

  • Committer: Package Import Robot
  • Author(s): Alexandros Frantzis
  • Date: 2015-10-08 16:12:19 UTC
  • mto: This revision was merged to the branch mainline in revision 109.
  • Revision ID: package-import@ubuntu.com-20151008161219-emk4a1ys51yy0wjb
Tags: upstream-0.17.0+15.10.20151008.2
Import upstream version 0.17.0+15.10.20151008.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp
2
2
 
3
3
#include "src/server/graphics/offscreen/display.h"
4
4
#include "mir/graphics/default_display_configuration_policy.h"
 
5
#include "mir/renderer/gl/render_target.h"
5
6
#include "src/server/report/null_report_factory.h"
6
7
 
7
8
#include "mir/test/doubles/mock_egl.h"
8
9
#include "mir/test/doubles/mock_gl.h"
 
10
#include "mir/test/as_render_target.h"
9
11
 
10
12
#include <gmock/gmock.h>
11
13
#include <gtest/gtest.h>
16
18
namespace mgo=mir::graphics::offscreen;
17
19
namespace mtd=mir::test::doubles;
18
20
namespace mr = mir::report;
 
21
namespace mt = mir::test;
19
22
 
20
23
namespace
21
24
{
128
131
            EXPECT_CALL(mock_egl, eglMakeCurrent(_,_,_,Ne(EGL_NO_CONTEXT)));
129
132
            EXPECT_CALL(mock_gl, glBindFramebuffer(_,Ne(0)));
130
133
 
131
 
            db.make_current();
 
134
            mt::as_render_target(db)->make_current();
132
135
 
133
136
            Mock::VerifyAndClearExpectations(&mock_egl);
134
137
            Mock::VerifyAndClearExpectations(&mock_gl);