← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/integration-tests/graphics/android/test_internal_client.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/integration-tests/graphics/android/test_internal_client.cpp
21
21
#include "src/platform/graphics/android/interpreter_cache.h"
22
22
#include "src/platform/graphics/android/internal_client.h"
23
23
#include "src/server/compositor/buffer_stream_factory.h"
 
24
#include "src/server/report/null_report_factory.h"
24
25
#include "mir/graphics/buffer_initializer.h"
25
 
#include "mir/graphics/null_display_report.h"
 
26
#include "src/server/report/null_report_factory.h"
26
27
#include "mir/graphics/android/mir_native_window.h"
27
28
#include "mir/graphics/platform.h"
28
29
#include "mir/graphics/internal_client.h"
56
57
namespace mf=mir::frontend;
57
58
namespace mi=mir::input;
58
59
namespace mtd=mir::test::doubles;
 
60
namespace mr = mir::report;
59
61
namespace mo=mir::options;
60
62
 
61
63
namespace
93
95
    auto null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
94
96
    auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(null_buffer_initializer);
95
97
    auto buffer_stream_factory = std::make_shared<mc::BufferStreamFactory>(allocator);
96
 
    auto scene_report = std::make_shared<ms::NullSceneReport>();
 
98
    auto scene_report = mr::null_scene_report();
97
99
    auto surface_allocator = std::make_shared<ms::SurfaceAllocator>(buffer_stream_factory, stub_input_factory, scene_report);
98
100
    auto ss = std::make_shared<ms::SurfaceStack>(surface_allocator, stub_input_registrar, scene_report);
99
101
    auto surface_controller = std::make_shared<ms::SurfaceController>(ss);
103
105
    auto mir_surface = as_internal_surface(surface);
104
106
 
105
107
    auto options = std::shared_ptr<mo::ProgramOption>();
106
 
    auto report = std::shared_ptr<mg::NullDisplayReport>();
 
108
    auto report = mr::null_display_report();
107
109
    auto internal_client = std::make_shared<mga::InternalClient>();
108
110
 
109
111
    int major, minor, n;