Merge lp:~robertcarr/mir/client-input-report into lp:mir

[Robert Carr]

Add a client input receiver report.

Useful for debugging. You can try it out by running the input acceptance tests with MIR_CLIENT_INPUT_RECEIVER_REPORT=log

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1202
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/343/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/72/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/343/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1203
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/73/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/344/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I'm not entirely convinced by the log formatting. But I've not tried using this and you probably have.

It is at least a step forward

review: Approve

=== modified file 'doc/component_reports.md'
--- doc/component_reports.md	2013-10-24 11:41:30 +0000
+++ doc/component_reports.md	2013-11-06 00:09:36 +0000
@@ -40,6 +40,7 @@
 Report              | Handlers
 ------------------- | --------
 rpc-report          | log,lttng
+input-receiver      | log
 
 For example, to enable the logging RPC report, one should set the
 `MIR_CLIENT_RPC_REPORT=log` environment variable.
 
=== modified file 'include/shared/mir/input/input_platform.h'
--- include/shared/mir/input/input_platform.h	2013-05-13 23:20:52 +0000
+++ include/shared/mir/input/input_platform.h	2013-11-06 00:09:36 +0000
@@ -31,6 +31,7 @@
 namespace receiver
 {
 class InputReceiverThread;
+class InputReceiverReport;
 
 // Interface for MirSurface to construct input dispatcher threads.
 class InputPlatform
@@ -39,8 +40,9 @@
     virtual ~InputPlatform() {};  
 
     virtual std::shared_ptr<InputReceiverThread> create_input_thread(int fd, std::function<void(MirEvent *)> const& callback) = 0;
-    
+
     static std::shared_ptr<InputPlatform> create();
+    static std::shared_ptr<InputPlatform> create(std::shared_ptr<InputReceiverReport> const& report);
 
 protected:
     InputPlatform() = default;
 
=== added file 'include/shared/mir/input/input_receiver_report.h'
--- include/shared/mir/input/input_receiver_report.h	1970-01-01 00:00:00 +0000
+++ include/shared/mir/input/input_receiver_report.h	2013-11-06 00:09:36 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_INPUT_RECEIVER_REPORT_H_
+#define MIR_CLIENT_INPUT_RECEIVER_REPORT_H_
+
+#include <mir_toolkit/event.h>
+
+namespace mir
+{
+namespace input
+{
+namespace receiver
+{
+
+class InputReceiverReport
+{
+public:
+    virtual ~InputReceiverReport() = default;
+
+    virtual void received_event(MirEvent const& event) = 0;
+
+protected:
+    InputReceiverReport() = default;
+    InputReceiverReport(InputReceiverReport const&) = delete;
+    InputReceiverReport& operator=(InputReceiverReport const&) = delete;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_INPUT_RECEIVER_REPORT_H_ */
 
=== added file 'include/shared/mir/input/null_input_receiver_report.h'
--- include/shared/mir/input/null_input_receiver_report.h	1970-01-01 00:00:00 +0000
+++ include/shared/mir/input/null_input_receiver_report.h	2013-11-06 00:09:36 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_NULL_INPUT_RECEIVER_REPORT_H_
+#define MIR_CLIENT_NULL_INPUT_RECEIVER_REPORT_H_
+
+#include "mir/input/input_receiver_report.h"
+
+#include <mir_toolkit/event.h>
+
+namespace mir
+{
+namespace input
+{
+namespace receiver
+{
+
+class NullInputReceiverReport : public InputReceiverReport
+{
+public:
+    NullInputReceiverReport() = default;
+    virtual ~NullInputReceiverReport() = default;
+
+    void received_event(MirEvent const& /* event */) {}
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_NULL_INPUT_RECEIVER_REPORT_H_ */
 
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-10-21 16:02:28 +0000
+++ src/client/CMakeLists.txt	2013-11-06 00:09:36 +0000
@@ -29,6 +29,7 @@
   mir_wait_handle.cpp
   mir_surface.cpp
   logging/rpc_report.cpp
+  logging/input_receiver_report.cpp
   default_connection_configuration.cpp
   surface_map.cpp
   lifecycle_control.cpp
 
=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2013-08-28 03:41:48 +0000
+++ src/client/default_connection_configuration.cpp	2013-11-06 00:09:36 +0000
@@ -24,7 +24,9 @@
 #include "mir/logging/dumb_console_logger.h"
 #include "native_client_platform_factory.h"
 #include "mir/input/input_platform.h"
+#include "mir/input/null_input_receiver_report.h"
 #include "logging/rpc_report.h"
+#include "logging/input_receiver_report.h"
 #include "lttng/rpc_report.h"
 #include "connection_surface_map.h"
 #include "lifecycle_control.h"
@@ -88,9 +90,9 @@
 mcl::DefaultConnectionConfiguration::the_input_platform()
 {
     return input_platform(
-        []
+        [this]
         {
-            return mir::input::receiver::InputPlatform::create();
+            return mir::input::receiver::InputPlatform::create(the_input_receiver_report());
         });
 }
 
@@ -118,6 +120,22 @@
         });
 }
 
+std::shared_ptr<mir::input::receiver::InputReceiverReport>
+mcl::DefaultConnectionConfiguration::the_input_receiver_report()
+{
+    return input_receiver_report(
+        [this] () -> std::shared_ptr<mir::input::receiver::InputReceiverReport>
+        {
+            auto val_raw = getenv("MIR_CLIENT_INPUT_RECEIVER_REPORT");
+            std::string const val{val_raw ? val_raw : off_opt_val};
+            
+            if (val == log_opt_val)
+                return std::make_shared<mcl::logging::InputReceiverReport>(the_logger());
+            else
+                return std::make_shared<mir::input::receiver::NullInputReceiverReport>();
+        });
+}
+
 std::shared_ptr<mcl::DisplayConfiguration> mcl::DefaultConnectionConfiguration::the_display_configuration()
 {
     return display_configuration(
 
=== modified file 'src/client/default_connection_configuration.h'
--- src/client/default_connection_configuration.h	2013-08-28 03:41:48 +0000
+++ src/client/default_connection_configuration.h	2013-11-06 00:09:36 +0000
@@ -27,6 +27,13 @@
 
 namespace mir
 {
+namespace input
+{
+namespace receiver
+{
+class InputReceiverReport;
+}
+}
 namespace client
 {
 
@@ -50,6 +57,7 @@
 
     virtual std::string the_socket_file();
     virtual std::shared_ptr<rpc::RpcReport> the_rpc_report();
+    virtual std::shared_ptr<input::receiver::InputReceiverReport> the_input_receiver_report();
 
 protected:
     CachedPtr<rpc::MirBasicRpcChannel> rpc_channel;
@@ -61,6 +69,7 @@
     CachedPtr<LifecycleControl> lifecycle_control;
 
     CachedPtr<rpc::RpcReport> rpc_report;
+    CachedPtr<input::receiver::InputReceiverReport> input_receiver_report;
 
 private:
     std::string const socket_file;
 
=== added file 'src/client/logging/input_receiver_report.cpp'
--- src/client/logging/input_receiver_report.cpp	1970-01-01 00:00:00 +0000
+++ src/client/logging/input_receiver_report.cpp	2013-11-06 00:09:36 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#include "input_receiver_report.h"
+
+#include "mir/logging/logger.h"
+
+#include <boost/throw_exception.hpp>
+
+#include <sstream>
+#include <stdexcept>
+
+namespace ml = mir::logging;
+namespace mcll = mir::client::logging;
+
+namespace
+{
+std::string const component{"input-receiver"};
+}
+
+mcll::InputReceiverReport::InputReceiverReport(std::shared_ptr<ml::Logger> const& logger)
+    : logger{logger}
+{
+}
+
+namespace
+{
+
+static void format_key_event(std::stringstream &ss, MirKeyEvent const& ev)
+{
+    ss << "MirKeyEvent {" << std::endl;
+    ss << "  device_id: " << ev.device_id << std::endl;
+    ss << "  source_id: " << ev.source_id << std::endl;
+    ss << "  action: " << ev.action << std::endl;
+    ss << "  flags: " << ev.flags << std::endl;
+    ss << "  modifiers: " << ev.modifiers << std::endl;
+    ss << "  key_code: " << ev.key_code << std::endl;
+    ss << "  scan_code: " << ev.scan_code << std::endl;
+    ss << "  repeat_count: " << ev.repeat_count << std::endl;
+    ss << "  down_time: " << ev.down_time << std::endl;
+    ss << "  event_time: " << ev.event_time << std::endl;
+    ss << "  is_system_key: " << ev.is_system_key << std::endl;
+    ss << "}";
+}
+static void format_motion_event(std::stringstream &ss, MirMotionEvent const& ev)
+{
+    ss << "MirMotionEvent{" << std::endl;
+    ss << "  type: motion" << std::endl;
+    ss << "  device_id: " << ev.device_id << std::endl;
+    ss << "  source_id: " << ev.source_id << std::endl;
+    ss << "  action: " << ev.action << std::endl;
+    ss << "  flags: " << ev.flags << std::endl;
+    ss << "  modifiers: " << ev.modifiers << std::endl;
+    ss << "  edge_flags: " << ev.edge_flags << std::endl;
+    ss << "  button_state: " << ev.button_state << std::endl;
+    ss << "  x_offset: " << ev.x_offset << std::endl;
+    ss << "  y_offset: " << ev.y_offset << std::endl;
+    ss << "  x_precision: " << ev.x_precision << std::endl;
+    ss << "  y_precision: " << ev.y_precision << std::endl;
+    ss << "  down_time: " << ev.down_time << std::endl;
+    ss << "  event_time: " << ev.event_time << std::endl;
+    ss << "  pointer_count: " << ev.pointer_count << std::endl;
+    for (unsigned int i = 0; i < ev.pointer_count; i++)
+    {
+        ss << "  pointer[" << i << "]{" << std::endl;
+        ss << "    id: " << ev.pointer_coordinates[i].id << std::endl;
+        ss << "    x: " << ev.pointer_coordinates[i].x << std::endl;
+        ss << "    raw_x: " << ev.pointer_coordinates[i].raw_x << std::endl;
+        ss << "    y: " << ev.pointer_coordinates[i].y << std::endl;
+        ss << "    raw_y: " << ev.pointer_coordinates[i].raw_y << std::endl;
+        ss << "    touch_major: " << ev.pointer_coordinates[i].touch_major << std::endl;
+        ss << "    touch_minor: " << ev.pointer_coordinates[i].touch_minor << std::endl;
+        ss << "    size: " << ev.pointer_coordinates[i].size << std::endl;
+        ss << "    pressure: " << ev.pointer_coordinates[i].pressure << std::endl;
+        ss << "    orientation: " << ev.pointer_coordinates[i].orientation << std::endl;
+        ss << "    vscroll: " << ev.pointer_coordinates[i].vscroll << std::endl;
+        ss << "    hscroll: " << ev.pointer_coordinates[i].hscroll << std::endl;
+        ss << "  }" << std::endl;
+    }
+    ss << "}";
+}
+
+static void format_event(std::stringstream &ss, MirEvent const& ev)
+{
+    switch (ev.type)
+    {
+    case mir_event_type_key:
+        format_key_event(ss, ev.key);
+        break;
+    case mir_event_type_motion:
+        format_motion_event(ss, ev.motion);
+        break;
+    default:
+        BOOST_THROW_EXCEPTION(std::runtime_error("Unexpected event type"));
+    }
+}
+
+}
+
+void mcll::InputReceiverReport::received_event(
+    MirEvent const& event)
+{
+    std::stringstream ss;
+
+    ss << "Received event:" << std::endl;
+    
+    format_event(ss, event);
+
+    logger->log<ml::Logger::debug>(ss.str(), component);
+}
 
=== added file 'src/client/logging/input_receiver_report.h'
--- src/client/logging/input_receiver_report.h	1970-01-01 00:00:00 +0000
+++ src/client/logging/input_receiver_report.h	2013-11-06 00:09:36 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_LOGGING_INPUT_RECEIVER_REPORT_H_
+#define MIR_CLIENT_LOGGING_INPUT_RECEIVER_REPORT_H_
+
+#include "mir/input/input_receiver_report.h"
+
+#include <memory>
+
+namespace mir
+{
+
+namespace logging
+{
+class Logger;
+}
+
+namespace client
+{
+namespace logging
+{
+
+class InputReceiverReport : public input::receiver::InputReceiverReport
+{
+public:
+    InputReceiverReport(std::shared_ptr<mir::logging::Logger> const& logger);
+
+    void received_event(MirEvent const& event) override;
+
+private:
+    std::shared_ptr<mir::logging::Logger> const logger;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_LOGGING_INPUT_RECEIVER_REPORT_H_ */
 
=== modified file 'src/shared/input/android/android_input_platform.cpp'
--- src/shared/input/android/android_input_platform.cpp	2013-05-13 23:20:52 +0000
+++ src/shared/input/android/android_input_platform.cpp	2013-11-06 00:09:36 +0000
@@ -20,10 +20,13 @@
 #include "android_input_receiver.h"
 #include "android_input_receiver_thread.h"
 
+#include "mir/input/null_input_receiver_report.h"
+
 namespace mircv = mir::input::receiver;
 namespace mircva = mircv::android;
 
-mircva::AndroidInputPlatform::AndroidInputPlatform()
+mircva::AndroidInputPlatform::AndroidInputPlatform(std::shared_ptr<mircv::InputReceiverReport> const& report)
+    : report(report)
 {
 }
 
@@ -34,11 +37,16 @@
 std::shared_ptr<mircv::InputReceiverThread> mircva::AndroidInputPlatform::create_input_thread(
     int fd, std::function<void(MirEvent*)> const& callback)
 {
-    auto receiver = std::make_shared<mircva::InputReceiver>(fd);
+    auto receiver = std::make_shared<mircva::InputReceiver>(fd, report);
     return std::make_shared<mircva::InputReceiverThread>(receiver, callback);
 }
 
 std::shared_ptr<mircv::InputPlatform> mircv::InputPlatform::create()
 {
-    return std::make_shared<mircva::AndroidInputPlatform>();
+    return create(std::make_shared<mircv::NullInputReceiverReport>());
+}
+
+std::shared_ptr<mircv::InputPlatform> mircv::InputPlatform::create(std::shared_ptr<mircv::InputReceiverReport> const& report)
+{
+    return std::make_shared<mircva::AndroidInputPlatform>(report);
 }
 
=== modified file 'src/shared/input/android/android_input_platform.h'
--- src/shared/input/android/android_input_platform.h	2013-05-13 23:20:52 +0000
+++ src/shared/input/android/android_input_platform.h	2013-11-06 00:09:36 +0000
@@ -34,7 +34,7 @@
 class AndroidInputPlatform : public InputPlatform
 {
 public:
-    AndroidInputPlatform();
+    AndroidInputPlatform(std::shared_ptr<InputReceiverReport> const& report);
     virtual ~AndroidInputPlatform();  
 
     std::shared_ptr<InputReceiverThread> create_input_thread(int fd, std::function<void(MirEvent *)> const& callback);
@@ -42,6 +42,9 @@
 protected:
     AndroidInputPlatform(const AndroidInputPlatform&) = delete;
     AndroidInputPlatform& operator=(const AndroidInputPlatform&) = delete;
+
+private:
+    std::shared_ptr<InputReceiverReport> const report;
 };
 
 }
 
=== modified file 'src/shared/input/android/android_input_receiver.cpp'
--- src/shared/input/android/android_input_receiver.cpp	2013-05-24 18:20:37 +0000
+++ src/shared/input/android/android_input_receiver.cpp	2013-11-06 00:09:36 +0000
@@ -19,6 +19,7 @@
 #include "android_input_receiver.h"
 
 #include "mir/input/xkb_mapper.h"
+#include "mir/input/input_receiver_report.h"
 #include "mir/input/android/android_input_lexicon.h"
 
 #include <androidfw/InputTransport.h>
@@ -29,8 +30,10 @@
 
 namespace mia = mir::input::android;
 
-mircva::InputReceiver::InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel)
+mircva::InputReceiver::InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel,
+                                     std::shared_ptr<mircv::InputReceiverReport> const& report)
   : input_channel(input_channel),
+    report(report),
     input_consumer(std::make_shared<droidinput::InputConsumer>(input_channel)),
     looper(new droidinput::Looper(true)),
     fd_added(false),
@@ -38,8 +41,10 @@
 {
 }
 
-mircva::InputReceiver::InputReceiver(int fd)
+mircva::InputReceiver::InputReceiver(int fd,
+                                     std::shared_ptr<mircv::InputReceiverReport> const& report)
   : input_channel(new droidinput::InputChannel(droidinput::String8(""), fd)), 
+    report(report),
     input_consumer(std::make_shared<droidinput::InputConsumer>(input_channel)),
     looper(new droidinput::Looper(true)),
     fd_added(false),
@@ -84,6 +89,8 @@
         map_key_event(xkb_mapper, ev);
 
         input_consumer->sendFinishedSignal(event_sequence_id, true);
+        
+        report->received_event(ev);
 
         return true;
     }
 
=== modified file 'src/shared/input/android/android_input_receiver.h'
--- src/shared/input/android/android_input_receiver.h	2013-05-24 18:20:37 +0000
+++ src/shared/input/android/android_input_receiver.h	2013-11-06 00:09:36 +0000
@@ -43,6 +43,7 @@
 namespace receiver
 {
 class XKBMapper;
+class InputReceiverReport;
 
 namespace android
 {
@@ -51,8 +52,10 @@
 class InputReceiver
 {
 public:
-    InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel);
-    InputReceiver(int fd);
+    InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel,
+                  std::shared_ptr<InputReceiverReport> const& report);
+    InputReceiver(int fd,
+                  std::shared_ptr<InputReceiverReport> const& report);
 
     virtual ~InputReceiver();
     int fd() const;
@@ -71,6 +74,8 @@
 
 private:
     droidinput::sp<droidinput::InputChannel> input_channel;
+    std::shared_ptr<InputReceiverReport> const report;
+
     std::shared_ptr<droidinput::InputConsumer> input_consumer;
     droidinput::PreallocatedInputEventFactory event_factory;
     droidinput::sp<droidinput::Looper> looper;
 
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2013-05-31 16:06:07 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2013-11-06 00:09:36 +0000
@@ -17,8 +17,10 @@
  */
 
 #include "src/shared/input/android/android_input_receiver.h"
+#include "mir/input/null_input_receiver_report.h"
 #include "mir_toolkit/event.h"
 
+
 #include <androidfw/InputTransport.h>
 
 #include <gmock/gmock.h>
@@ -27,7 +29,8 @@
 #include <unistd.h>
 #include <memory>
 
-namespace mircva = mir::input::receiver::android;
+namespace mircv = mir::input::receiver;
+namespace mircva = mircv::android;
 
 namespace droidinput = android;
 
@@ -142,14 +145,14 @@
 
 TEST_F(AndroidInputReceiverSetup, receiever_takes_channel_fd)
 {
-    mircva::InputReceiver receiver(client_fd);
+    mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     
     EXPECT_EQ(client_fd, receiver.fd());
 }
 
 TEST_F(AndroidInputReceiverSetup, receiver_receives_key_events)
 {
-    mircva::InputReceiver receiver(client_fd);
+    mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     TestingInputProducer producer(server_fd);
     
     producer.produce_a_key_event();
@@ -165,7 +168,7 @@
 
 TEST_F(AndroidInputReceiverSetup, receiver_handles_events)
 {
-    mircva::InputReceiver receiver(client_fd);
+    mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     TestingInputProducer producer(server_fd);
     
     producer.produce_a_key_event();
@@ -181,7 +184,7 @@
 
 TEST_F(AndroidInputReceiverSetup, receiver_consumes_batched_motion_events)
 {
-    mircva::InputReceiver receiver(client_fd);
+    mircva::InputReceiver receiver(client_fd, std::make_shared<mircv::NullInputReceiverReport>());
     TestingInputProducer producer(server_fd);
     
     // Produce 3 motion events before client handles any.
 
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver_thread.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver_thread.cpp	2013-05-13 23:20:52 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver_thread.cpp	2013-11-06 00:09:36 +0000
@@ -19,6 +19,8 @@
 #include "src/shared/input/android/android_input_receiver_thread.h"
 #include "src/shared/input/android/android_input_receiver.h"
 
+#include "mir/input/null_input_receiver_report.h"
+
 #include "mir_toolkit/mir_client_library.h"
 
 #include <gtest/gtest.h>
@@ -30,7 +32,8 @@
 
 #include <fcntl.h>
 
-namespace mircva = mir::input::receiver::android;
+namespace mircv = mir::input::receiver;
+namespace mircva = mircv::android;
 
 namespace
 {
@@ -43,7 +46,7 @@
 struct MockInputReceiver : public mircva::InputReceiver
 {
     MockInputReceiver(int fd)
-      : InputReceiver(fd)
+      : InputReceiver(fd, std::make_shared<mircv::NullInputReceiverReport>())
     {
     }
     MOCK_METHOD1(next_event, bool(MirEvent &));