Merge lp:~robertcarr/mir/i-love-deduping-mocks into lp:~mir-team/mir/trunk

[Robert Carr]

Dedupe mock usage in test_focus_management_api.cpp

Dedupe mock usage in test_focus_management_api.cpp

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:552
http://jenkins.qa.ubuntu.com/job/mir-ci/282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/286
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/286/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

seems ok

[Kevin DuBois (kdub)]

review: Approve

[Daniel van Vugt (vanvugt)]

Du-duplication is awesome, but the result is confusing:

class MockShell : public mtd::MockShell

Two MockShell classes?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> Du-duplication is awesome, but the result is confusing:
>
> class MockShell : public mtd::MockShell
>
> Two MockShell classes?

I'm not entirely convinced by Robert's mission to remove all duplication (see link below) and this is a case too confusing.

http://programmer.97things.oreilly.com/wiki/index.php/Beware_the_Share

review: Needs Fixing

Unmerged revisions

552. By Robert Carr on 2013-04-02

Dedupe MockShell in test_focus_management_api.cpp

551. By Alan Griffiths on 2013-04-02

mir_toolkit: replace mir_toolkit namespace with a Doxygen group. Fixes: https://bugs.launchpad.net/bugs/1137170.

Approved by PS Jenkins bot, Kevin DuBois, Alexandros Frantzis.

550. By Alan Griffiths on 2013-04-02

examples: Add Doxygen markup to render_surfaces.cpp.

Approved by PS Jenkins bot, Robert Carr, Alexandros Frantzis.

549. By Robert Carr on 2013-04-02

Five minutes of doxygen comments.

Approved by Kevin DuBois, PS Jenkins bot.

548. By Kevin DuBois on 2013-04-01

MirNativeWindow is the code that allows us to communicate buffers to the driver on android. Currently, we're just using this in our clients so they can use the buffers that they get over ipc, but we will need this code for our own fb native window type (to deprecate 3rd_party/android-fbtype) and for inprocess-egl work on the android side.

Approved by Alexandros Frantzis, PS Jenkins bot.

547. By Alan Griffiths on 2013-03-29

legion: trim trailing whitespace.

Approved by PS Jenkins bot, Kevin DuBois.

546. By Alan Griffiths on 2013-03-29

logging, config: Add a glog based logging option.

Approved by PS Jenkins bot, Alexandros Frantzis, Kevin DuBois.

545. By Alan Griffiths on 2013-03-28

examples, test: reuse run_mir() for managing DisplayServer invocation.

Approved by Kevin DuBois, Alexandros Frantzis, PS Jenkins bot.

544. By Daniel van Vugt on 2013-03-28

Remove dead code ("binder" support) (LP: #1160741). Fixes: https://bugs.launchpad.net/bugs/1160741.

Approved by Alan Griffiths, PS Jenkins bot.

543. By Kevin DuBois on 2013-03-28

add classes for supporting for HWC 1.1 device (nexus4).

Approved by Alan Griffiths, Alexandros Frantzis, Robert Ancell, PS Jenkins bot.

=== modified file 'tests/acceptance-tests/test_focus_management_api.cpp'
--- tests/acceptance-tests/test_focus_management_api.cpp	2013-03-22 10:34:16 +0000
+++ tests/acceptance-tests/test_focus_management_api.cpp	2013-04-02 16:58:40 +0000
@@ -23,6 +23,7 @@
 #include "mir/frontend/shell.h"
 
 #include "mir_test_doubles/mock_display.h"
+#include "mir_test_doubles/mock_shell.h"
 #include "mir_test_framework/display_server_test_fixture.h"
 
 #include <gtest/gtest.h>
@@ -118,7 +119,7 @@
     }
 };
 
-class MockShell : public frontend::Shell
+class MockShell : public mtd::MockShell
 {
 public:
     MockShell(std::shared_ptr<Shell> const& impl) :
@@ -137,15 +138,6 @@
         ON_CALL(*this, shutdown()).WillByDefault(Invoke(impl.get(), &Shell::shutdown));
     }
 
-    MOCK_METHOD1(open_session, std::shared_ptr<mf::Session> (std::string const& name));
-    MOCK_METHOD1(close_session, void (std::shared_ptr<mf::Session> const& session));
-
-    MOCK_METHOD2(tag_session_with_lightdm_id, void (std::shared_ptr<mf::Session> const& session, int id));
-    MOCK_METHOD1(focus_session_with_lightdm_id, void (int id));
-
-    MOCK_METHOD2(create_surface_for, frontend::SurfaceId(std::shared_ptr<mf::Session> const&, mf::SurfaceCreationParameters const&));
-    MOCK_METHOD0(shutdown, void ());
-
 private:
     std::shared_ptr<frontend::Shell> const impl;
 };