← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/unit-tests/android_input/input_reader.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/android_input/input_reader.cpp
24
24
#include <gmock/gmock.h>
25
25
#include <math.h>
26
26
 
27
 
#include <mir/logging/logger.h>
28
 
#include <mir/logging/input_report.h>
29
 
#include <mir_test/fake_event_hub.h>
 
27
#include "mir/logging/logger.h"
 
28
#include "mir/report/legacy_input_report.h"
 
29
#include "mir_test/fake_event_hub.h"
30
30
 
31
 
namespace ml  = mir::logging;
 
31
namespace ml   = mir::logging;
32
32
 
33
33
using std::string;
34
34
using mir::input::android::FakeEventHub;
568
568
    sp<InstrumentedInputReader> mReader;
569
569
 
570
570
    virtual void SetUp() {
571
 
        mir::logging::legacy_input_report::initialize(std::make_shared<TestLogger>());
 
571
        mir::report::legacy_input::initialize(std::make_shared<TestLogger>());
572
572
        mFakeEventHub = new FakeEventHub();
573
573
        mFakePolicy = new FakeInputReaderPolicy();
574
574
        mFakeListener = new FakeInputListener();
797
797
    InputDevice* mDevice;
798
798
 
799
799
    virtual void SetUp() {
800
 
        mir::logging::legacy_input_report::initialize(std::make_shared<TestLogger>());
 
800
        mir::report::legacy_input::initialize(std::make_shared<TestLogger>());
801
801
        mFakeEventHub = new FakeEventHub();
802
802
        mFakePolicy = new FakeInputReaderPolicy();
803
803
        mFakeListener = new FakeInputListener();
987
987
    InputDevice* mDevice;
988
988
 
989
989
    virtual void SetUp() {
990
 
        mir::logging::legacy_input_report::initialize(std::make_shared<TestLogger>());
 
990
        mir::report::legacy_input::initialize(std::make_shared<TestLogger>());
991
991
        mFakeEventHub = new FakeEventHub();
992
992
        mFakePolicy = new FakeInputReaderPolicy();
993
993
        mFakeListener = new FakeInputListener();