← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/android/test_android_platform.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-03-10 19:28:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2
Tags: upstream-0.1.6+14.04.20140310
Import upstream version 0.1.6+14.04.20140310

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/android/test_android_platform.cpp
16
16
 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17
17
 */
18
18
 
19
 
#include "mir/graphics/null_display_report.h"
 
19
#include "src/server/report/null_report_factory.h"
20
20
#include "mir/graphics/native_platform.h"
21
21
#include "mir/graphics/buffer_ipc_packer.h"
22
22
#include "mir/options/program_option.h"
35
35
namespace mga=mir::graphics::android;
36
36
namespace mt=mir::test;
37
37
namespace mtd=mir::test::doubles;
 
38
namespace mr=mir::report;
38
39
namespace geom=mir::geometry;
39
40
namespace mo=mir::options;
40
41
 
46
47
        using namespace testing;
47
48
 
48
49
        stub_display_builder = std::make_shared<mtd::StubDisplayBuilder>();
49
 
        stub_display_report = std::make_shared<mg::NullDisplayReport>();
 
50
        stub_display_report = mr::null_display_report();
50
51
        stride = geom::Stride(300*4);
51
52
 
52
53
        num_ints = 43;
119
120
{
120
121
    mga::AndroidPlatform platform(
121
122
        std::make_shared<mtd::StubDisplayBuilder>(),
122
 
        std::make_shared<mg::NullDisplayReport>());
 
123
        mr::null_display_report());
123
124
 
124
125
    EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display());
125
126
}