Merge lp:~robertcarr/mir/tests-are-bests-when-built-and-run into lp:~mir-team/mir/trunk

[Robert Carr]

Build test_android_input_registrar.cpp

Build test_android_input_registrar.cpp

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:885
http://jenkins.qa.ubuntu.com/job/mir-ci/1096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/334
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/334/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1096/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Robert Ancell (robert-ancell)]

Yep

review: Approve

=== removed file 'include/test/mir_test_doubles/mock_input_configuration.h'
--- include/test/mir_test_doubles/mock_input_configuration.h	2013-05-23 20:06:04 +0000
+++ include/test/mir_test_doubles/mock_input_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_TEST_DOUBLES_MOCK_INPUT_CONFIGURATION_H_
-#define MIR_TEST_DOUBLES_MOCK_INPUT_CONFIGURATION_H_
-
-#include "mir/input/android/android_input_configuration.h"
-
-#include <EventHub.h>
-
-#include <gmock/gmock.h>
-
-namespace droidinput = android;
-
-namespace mir
-{
-namespace test
-{
-namespace doubles
-{
-
-struct MockInputConfiguration : public input::android::InputConfiguration
-{
-    MOCK_METHOD0(the_event_hub, droidinput::sp<droidinput::EventHubInterface>());
-    MOCK_METHOD0(the_dispatcher, droidinput::sp<droidinput::InputDispatcherInterface>());
-    MOCK_METHOD0(the_dispatcher_thread, std::shared_ptr<input::android::InputThread>());
-    MOCK_METHOD0(the_reader_thread, std::shared_ptr<input::android::InputThread>());
-    
-    MOCK_METHOD0(the_input_registrar, std::shared_ptr<surfaces::InputRegistrar>());
-    MOCK_METHOD0(the_input_targeter, std::shared_ptr<shell::InputTargeter>());
-
-    MOCK_METHOD1(set_input_targets, void(std::shared_ptr<input::InputTargets> const&));
-};
-
-}
-}
-} // namespace mir
-
-#endif // MIR_TEST_DOUBLES_MOCK_INPUT_CONFIGURATION_H_

=== modified file 'tests/unit-tests/input/android/CMakeLists.txt'
--- tests/unit-tests/input/android/CMakeLists.txt	2013-07-03 21:46:28 +0000
+++ tests/unit-tests/input/android/CMakeLists.txt	2013-07-24 19:17:30 +0000
@@ -9,6 +9,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_window_handle.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_targeter.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_target_enumerator.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_registrar.cpp
 )
 
 set(

=== modified file 'tests/unit-tests/input/android/test_android_input_registrar.cpp'
--- tests/unit-tests/input/android/test_android_input_registrar.cpp	2013-07-05 15:58:08 +0000
+++ tests/unit-tests/input/android/test_android_input_registrar.cpp	2013-07-24 19:17:30 +0000
@@ -16,9 +16,10 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
+#include "mir/input/surface.h"
+
 #include "src/server/input/android/android_input_registrar.h"
 
-#include "mir_test_doubles/mock_input_configuration.h"
 #include "mir_test_doubles/mock_input_dispatcher.h"
 #include "mir_test_doubles/stub_input_channel.h"
 
@@ -36,6 +37,7 @@
 namespace mia = mi::android;
 namespace mt = mir::test;
 namespace mtd = mt::doubles;
+namespace geom = mir::geometry;
 
 namespace
 {
@@ -57,12 +59,32 @@
     }
     int test_input_fd;
     droidinput::sp<mtd::MockInputDispatcher> dispatcher;
-    mtd::MockInputConfiguration config;
-};
-
-MATCHER_P(WindowHandleFor, surface, "")
-{
-    if (arg->getInputChannel()->getFd() != surface->server_input_fd())
+};
+
+struct StubInputSurface : public mi::Surface
+{
+    geom::Point position() const
+    {
+        return geom::Point();
+    }
+    geom::Size size() const
+    {
+        return geom::Size();
+    }
+    std::string const& name() const
+    {
+        static std::string const name;
+        return name;
+    }
+    bool contains(geom::Point const&) const
+    {
+        return true;
+    }
+};
+
+MATCHER_P(WindowHandleFor, channel, "")
+{
+    if (arg->getInputChannel()->getFd() != channel->server_fd())
         return false;
     return true;
 }
@@ -73,19 +95,18 @@
 {    
     using namespace ::testing;
 
-    auto surface = std::make_shared<mtd::StubInputChannel>(test_input_fd);
+    auto channel = std::make_shared<mtd::StubInputChannel>(test_input_fd);
+    auto surface = std::make_shared<StubInputSurface>();
 
-    EXPECT_CALL(config, the_dispatcher()).Times(1)
-        .WillOnce(Return(dispatcher));
-    EXPECT_CALL(*dispatcher, registerInputChannel(_, WindowHandleFor(surface), false)).Times(1)
+    EXPECT_CALL(*dispatcher, registerInputChannel(_, WindowHandleFor(channel), false)).Times(1)
         .WillOnce(Return(droidinput::OK));
 
-    mia::InputRegistrar registrar(mt::fake_shared(config));
+    mia::InputRegistrar registrar(dispatcher);
     
-     registrar.input_channel_opened(surface);
+     registrar.input_channel_opened(channel, surface);
      EXPECT_THROW({
              // We can't open a surface twice
-             registrar.input_channel_opened(surface);
+             registrar.input_channel_opened(channel, surface);
      }, std::logic_error);
 }
 
@@ -93,24 +114,23 @@
 {
     using namespace ::testing;
 
-    auto surface = std::make_shared<mtd::StubInputChannel>(test_input_fd);
+    auto channel = std::make_shared<mtd::StubInputChannel>(test_input_fd);
+    auto surface = std::make_shared<StubInputSurface>();
 
-    EXPECT_CALL(config, the_dispatcher()).Times(1)
-        .WillOnce(Return(dispatcher));
-    EXPECT_CALL(*dispatcher, registerInputChannel(_, WindowHandleFor(surface), false)).Times(1)
+    EXPECT_CALL(*dispatcher, registerInputChannel(_, WindowHandleFor(channel), false)).Times(1)
         .WillOnce(Return(droidinput::OK));
     EXPECT_CALL(*dispatcher, unregisterInputChannel(_)).Times(1);
-    mia::InputRegistrar registrar(mt::fake_shared(config));
+    mia::InputRegistrar registrar(dispatcher);
     
     EXPECT_THROW({
             // We can't close a surface which hasn't been opened
-            registrar.input_channel_closed(surface);
+            registrar.input_channel_closed(channel);
     }, std::logic_error);
-    registrar.input_channel_opened(surface);
-    registrar.input_channel_closed(surface);
+    registrar.input_channel_opened(channel, surface);
+    registrar.input_channel_closed(channel);
     EXPECT_THROW({
             // Nor can we close a surface twice
-            registrar.input_channel_closed(surface);
+            registrar.input_channel_closed(channel);
     }, std::logic_error);
 }