Merge into development-branch : tidy-code : Code : Mir

Status:	Merged
Merged at revision:	4120
Proposed branch:	lp:~alan-griffiths/mir/tidy-code
Merge into:	lp:mir
Diff against target:	277 lines (+9/-214) 2 files modified include/test/mir_test_framework/observant_shell.h (+4/-74) tests/mir_test_framework/observant_shell.cpp (+5/-140)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/tidy-code
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-03-28
Daniel van Vugt			Approve on 2017-03-28
Chris Halse Rogers		2017-03-27	Approve on 2017-03-27
Review via email: mp+321093@code.launchpad.net

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-27:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3254/rebuild

PASSED: Continuous integration, rev:4119
https://mir-jenkins.ubuntu.com/job/mir-ci/3254/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4382
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4471
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4461
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4461
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4461
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4414
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4414/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4414
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4414/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4414
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4414/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4414
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4414/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4414
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4414/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4414
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4414/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3254/rebuild

review: Approve (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2017-03-27:

#

Yay. Red!

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-03-28:

#

OK

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2017-03-28:

#

review: Approve (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-03-28:

#

"08:00:55 E: dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to correct the problem."

Is this a new failure mode? testflinger?

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-03-28:

#

09:34:02 ++ testflinger-cli submit -q /dev/stdin
09:34:09 Traceback (most recent call last):
09:34:09 File "/snap/testflinger-cli/9/lib/python3.5/site-packages/requests/packages/urllib3/connectionpool.py", line 386, in _make_request
09:34:09 six.raise_from(e, None)
...
09:34:09 During handling of the above exception, another exception occurred:
...
09:34:09 + JOB_ID=
09:34:09 Build step 'Execute shell' marked build as failure
09:34:09 [WS-CLEANUP] Deleting project workspace...[WS-CLEANUP] done
09:34:09 Finished: FAILURE

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2017-03-28:

#

review: Approve (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28:

#

review: Needs Fixing (continuous-integration)

Mir

Merge lp:~alan-griffiths/mir/tidy-code into lp:mir

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'include/test/mir_test_framework/observant_shell.h'
 --- include/test/mir_test_framework/observant_shell.h	2017-03-09 17:42:58 +0000
 +++ include/test/mir_test_framework/observant_shell.h	2017-03-27 16:55:20 +0000
@@ -19,96 +19,26 @@
  #ifndef MIR_TEST_OBSERVANT_SHELL_H_
  #define MIR_TEST_OBSERVANT_SHELL_H_
--#include "mir/scene/session.h"
--#include "mir/scene/surface.h"
--#include "mir/shell/shell.h"
++#include "mir/shell/shell_wrapper.h"
++
++namespace mir { namespace scene { class SurfaceObserver; }}
  namespace mir_test_framework
+ {
--
--struct ObservantShell : mir::shell::Shell
++struct ObservantShell : mir::shell::ShellWrapper
+ {
      ObservantShell(
          std::shared_ptr<mir::shell::Shell> const& wrapped,
          std::shared_ptr<mir::scene::SurfaceObserver> const& surface_observer);
--    void add_display(mir::geometry::Rectangle const& area) override;
--
--    void remove_display(mir::geometry::Rectangle const& area) override;
--
--    bool handle(MirEvent const& event) override;
--
--    void focus_next_session() override;
--
--    auto focused_session() const -> std::shared_ptr<mir::scene::Session> override;
--
--    void set_focus_to(
--        std::shared_ptr<mir::scene::Session> const& focus_session,
--        std::shared_ptr<mir::scene::Surface> const& focus_surface) override;
--
--    std::shared_ptr<mir::scene::Surface> focused_surface() const override;
--
--    auto surface_at(mir::geometry::Point cursor) const -> std::shared_ptr<mir::scene::Surface> override;
--
--    void raise(mir::shell::SurfaceSet const& surfaces) override;
--
--    std::shared_ptr<mir::scene::Session> open_session(
--        pid_t client_pid,
--        std::string const& name,
--        std::shared_ptr<mir::frontend::EventSink> const& sink) override;
--
--    void close_session(std::shared_ptr<mir::scene::Session> const& session) override;
--
--    std::shared_ptr<mir::scene::PromptSession> start_prompt_session_for(
--        std::shared_ptr<mir::scene::Session> const& session,
--        mir::scene::PromptSessionCreationParameters const& params) override;
--
--    void add_prompt_provider_for(
--        std::shared_ptr<mir::scene::PromptSession> const& prompt_session,
--        std::shared_ptr<mir::scene::Session> const& session) override;
--
--    void stop_prompt_session(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
--
      mir::frontend::SurfaceId create_surface(
          std::shared_ptr<mir::scene::Session> const& session,
          mir::scene::SurfaceCreationParameters const& params,
          std::shared_ptr<mir::frontend::EventSink> const& sink) override;
--    void modify_surface(
--        std::shared_ptr<mir::scene::Session> const& session,
--        std::shared_ptr<mir::scene::Surface> const& window,
--        mir::shell::SurfaceSpecification  const& modifications) override;
--
--    void destroy_surface(std::shared_ptr<mir::scene::Session> const& session, mir::frontend::SurfaceId window) override;
--
--    int set_surface_attribute(
--        std::shared_ptr<mir::scene::Session> const& session,
--        std::shared_ptr<mir::scene::Surface> const& window,
--        MirWindowAttrib attrib,
--        int value) override;
--
--    int get_surface_attribute(
--        std::shared_ptr<mir::scene::Surface> const& window,
--        MirWindowAttrib attrib) override;
--
--    void raise_surface(
--        std::shared_ptr<mir::scene::Session> const& session,
--        std::shared_ptr<mir::scene::Surface> const& window,
--        uint64_t timestamp) override;
--
--    void request_drag_and_drop(
--        std::shared_ptr<mir::scene::Session> const& session,
--        std::shared_ptr<mir::scene::Surface> const& window,
--        uint64_t timestamp) override;
--
--    void set_drag_and_drop_handle(std::vector<uint8_t> const& handle) override;
--    void clear_drag_and_drop_handle() override;
--
  private:
--    std::shared_ptr<mir::shell::Shell> const wrapped;
      std::shared_ptr<mir::scene::SurfaceObserver> const surface_observer;
  };
--
+ }
  #endif /* MIR_TEST_OBSERVANT_SHELL_H_ */
 === modified file 'tests/mir_test_framework/observant_shell.cpp'
 --- tests/mir_test_framework/observant_shell.cpp	2017-03-10 12:02:27 +0000
 +++ tests/mir_test_framework/observant_shell.cpp	2017-03-27 16:55:20 +0000
@@ -18,163 +18,28 @@
  #include "mir_test_framework/observant_shell.h"
--namespace geom = mir::geometry;
++#include "mir/scene/session.h"
++#include "mir/scene/surface.h"
++
  namespace msh = mir::shell;
  namespace msc = mir::scene;
  namespace mf = mir::frontend;
--namespace mi = mir::input;
  namespace mtf = mir_test_framework;
  mtf::ObservantShell::ObservantShell(
      std::shared_ptr<msh::Shell> const& wrapped,
      std::shared_ptr<msc::SurfaceObserver> const& surface_observer) :
--    wrapped(wrapped),
++    msh::ShellWrapper(wrapped),
      surface_observer(surface_observer)
+ {
+ }
--
--void mtf::ObservantShell::add_display(geom::Rectangle const& area)
--{
--    return wrapped->add_display(area);
--}
--
--void mtf::ObservantShell::remove_display(geom::Rectangle const& area)
--{
--    return wrapped->remove_display(area);
--}
--
--bool mtf::ObservantShell::handle(MirEvent const& event)
--{
--    return wrapped->handle(event);
--}
--
--void mtf::ObservantShell::focus_next_session()
--{
--    wrapped->focus_next_session();
--}
--
--auto mtf::ObservantShell::focused_session() const -> std::shared_ptr<msc::Session>
--{
--    return wrapped->focused_session();
--}
--
--void mtf::ObservantShell::set_focus_to(
--    std::shared_ptr<msc::Session> const& focus_session,
--    std::shared_ptr<msc::Surface> const& focus_surface)
--{
--    return wrapped->set_focus_to(focus_session, focus_surface);
--}
--
--std::shared_ptr<msc::Surface> mtf::ObservantShell::focused_surface() const
--{
--    return wrapped->focused_surface();
--}
--
--auto mtf::ObservantShell::surface_at(geom::Point cursor) const -> std::shared_ptr<msc::Surface>
--{
--    return wrapped->surface_at(cursor);
--}
--
--void mtf::ObservantShell::raise(msh::SurfaceSet const& surfaces)
--{
--    wrapped->raise(surfaces);
--}
--
--std::shared_ptr<msc::Session> mtf::ObservantShell::open_session(
--    pid_t client_pid,
--    std::string const& name,
--    std::shared_ptr<mf::EventSink> const& sink)
--{
--    return wrapped->open_session(client_pid, name, sink);
--}
--
--void mtf::ObservantShell::close_session(std::shared_ptr<msc::Session> const& session)
--{
--    wrapped->close_session(session);
--}
--
--std::shared_ptr<msc::PromptSession> mtf::ObservantShell::start_prompt_session_for(
--    std::shared_ptr<msc::Session> const& session,
--    msc::PromptSessionCreationParameters const& params)
--{
--    return wrapped->start_prompt_session_for(session, params);
--}
--
--void mtf::ObservantShell::add_prompt_provider_for(
--    std::shared_ptr<msc::PromptSession> const& prompt_session,
--    std::shared_ptr<msc::Session> const& session)
--{
--    wrapped->add_prompt_provider_for(prompt_session, session);
--}
--
--void mtf::ObservantShell::stop_prompt_session(std::shared_ptr<msc::PromptSession> const& prompt_session)
--{
--    wrapped->stop_prompt_session(prompt_session);
--}
--
  mf::SurfaceId mtf::ObservantShell::create_surface(
      std::shared_ptr<msc::Session> const& session,
      msc::SurfaceCreationParameters const& params,
      std::shared_ptr<mf::EventSink> const& sink)
+ {
--    auto id = wrapped->create_surface(session, params, sink);
++    auto id = msh::ShellWrapper::create_surface(session, params, sink);
      auto window = session->surface(id);
      window->add_observer(surface_observer);
      return id;
+ }
--
--void mtf::ObservantShell::modify_surface(
--    std::shared_ptr<msc::Session> const& session,
--    std::shared_ptr<msc::Surface> const& window,
--    msh::SurfaceSpecification  const& modifications)
--{
--    wrapped->modify_surface(session, window, modifications);
--}
--
--void mtf::ObservantShell::destroy_surface(std::shared_ptr<msc::Session> const& session, mf::SurfaceId window)
--{
--    wrapped->destroy_surface(session, window);
--}
--
--int mtf::ObservantShell::set_surface_attribute(
--    std::shared_ptr<msc::Session> const& session,
--    std::shared_ptr<msc::Surface> const& window,
--    MirWindowAttrib attrib,
--    int value)
--{
--    return wrapped->set_surface_attribute(session, window, attrib, value);
--}
--
--int mtf::ObservantShell::get_surface_attribute(
--    std::shared_ptr<msc::Surface> const& window,
--    MirWindowAttrib attrib)
--{
--    return wrapped->get_surface_attribute(window, attrib);
--}
--
--void mtf::ObservantShell::raise_surface(
--    std::shared_ptr<msc::Session> const& session,
--    std::shared_ptr<msc::Surface> const& window,
--    uint64_t timestamp)
--{
--    return wrapped->raise_surface(session, window, timestamp);
--}
--
--void mtf::ObservantShell::request_drag_and_drop(
--    std::shared_ptr<msc::Session> const& session,
--    std::shared_ptr<msc::Surface> const& window,
--    uint64_t timestamp)
--{
--    return wrapped->request_drag_and_drop(session, window, timestamp);
--}
--
--void mtf::ObservantShell::set_drag_and_drop_handle(std::vector<uint8_t> const& handle)
--{
--    wrapped->set_drag_and_drop_handle(handle);
--}
--
--void mtf::ObservantShell::clear_drag_and_drop_handle()
--{
--    wrapped->clear_drag_and_drop_handle();
--}
--