QtMir

Merge lp:~gerboland/qtmir/use-mir-test-dev into lp:qtmir

use-mir-test-dev
Merge into trunk

Proposed by Gerry Boland on 2016-08-22

Status:	Merged
Approved by:	Gerry Boland on 2016-08-25
Approved revision:	541
Merged at revision:	562
Proposed branch:	lp:~gerboland/qtmir/use-mir-test-dev
Merge into:	lp:qtmir
Diff against target:	455 lines (+38/-237) 12 files modified debian/control (+2/-1) tests/CMakeLists.txt (+2/-0) tests/framework/CMakeLists.txt (+1/-3) tests/framework/mock_display.cpp (+0/-35) tests/framework/mock_display.h (+0/-66) tests/framework/mock_display_configuration.cpp (+0/-25) tests/framework/mock_display_configuration.h (+0/-40) tests/framework/mock_gl_display_buffer.cpp (+0/-30) tests/framework/mock_gl_display_buffer.h (+4/-12) tests/mirserver/ScreensModel/CMakeLists.txt (+1/-0) tests/mirserver/ScreensModel/screensmodel_test.cpp (+9/-0) tests/mirserver/ScreensModel/stub_display.h (+19/-25)
To merge this branch:	bzr merge lp:~gerboland/qtmir/use-mir-test-dev
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2016-08-22	Approve on 2016-08-25
Unity8 CI Bot	continuous-integration		Approve on 2016-08-23
Review via email: mp+303537@code.launchpad.net

Commit Message

[tests] refactor ScreensModel test to use mocks from mirtest-dev

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-22:

FAILED: Continuous integration, rev:539
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/339/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2614/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2642/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/339/rebuild

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2016-08-22:

I like it, but...

+ mirtest-dev (>= 0.24.0)

s/$/,$/

review: Needs Fixing

lp:~gerboland/qtmir/use-mir-test-dev updated on 2016-08-22

540. By Gerry Boland on 2016-08-22: Debian control typo fix

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/340/rebuild

review: Needs Fixing (continuous-integration)

lp:~gerboland/qtmir/use-mir-test-dev updated on 2016-08-22

541. By Gerry Boland on 2016-08-22: Fix FTBFS: include pkg before adding subdirectories which require the pkg

Alan Griffiths (alan-griffiths) wrote on 2016-08-22:

Well, this time the error doesn't "leap out". I leave you to argue with debuild about search paths.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/342/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-23:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/343/rebuild

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2016-08-25:

If CI is happy I am too

review: Approve

lp:~gerboland/qtmir/use-mir-test-dev updated on 2016-09-07

542. By Gerry Boland on 2016-09-07: Merge qtmir trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Gerry Boland

Mir development team

 === modified file 'debian/control'
 --- debian/control	2016-08-30 12:32:13 +0000
 +++ debian/control	2016-09-07 09:24:06 +0000
@@ -28,7 +28,8 @@
                 liburl-dispatcher1-dev,
                 libxkbcommon-dev,
                 libxrender-dev,
--               mir-renderer-gl-dev (>= 0.22.0),
++               mir-renderer-gl-dev (>= 0.24.0),
++               mirtest-dev (>= 0.24.0),
                 pkg-config,
  # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
                 python3:any,
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2016-04-26 08:56:36 +0000
 +++ tests/CMakeLists.txt	2016-09-07 09:24:06 +0000
@@ -1,5 +1,7 @@
  find_package(GMock)
++pkg_check_modules(MIRTEST mirtest>=0.24 REQUIRED)
++
  add_subdirectory(framework)
  add_subdirectory(mirserver)
  add_subdirectory(modules)
 === modified file 'tests/framework/CMakeLists.txt'
 --- tests/framework/CMakeLists.txt	2016-08-30 12:24:19 +0000
 +++ tests/framework/CMakeLists.txt	2016-09-07 09:24:06 +0000
@@ -8,6 +8,7 @@
      ${APPLICATION_API_INCLUDE_DIRS}
      ${MIRSERVER_INCLUDE_DIRS}
      ${MIRRENDERERGLDEV_INCLUDE_DIRS}
++    ${MIRTEST_INCLUDE_DIRS}
      ${Qt5Quick_INCLUDE_DIRS}
      ${Qt5DBus_INCLUDE_DIRS}
@@ -18,9 +19,6 @@
      fake_mirsurface.cpp
      fake_session.cpp
      mock_application_info.cpp
--    mock_display.cpp
--    mock_display_configuration.cpp
--    mock_gl_display_buffer.cpp
      mock_main_loop.cpp
      mock_mir_session.cpp
      mock_proc_info.cpp
 === removed file 'tests/framework/mock_display.cpp'
 --- tests/framework/mock_display.cpp	2015-11-11 10:43:36 +0000
 +++ tests/framework/mock_display.cpp	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
--/*
-- * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, 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/>.
-- */
--
--#include "mock_display.h"
--#include <mir/graphics/event_handler_register.h>
--#include <mir/graphics/display_configuration.h>
--
--MockDisplaySyncGroup::MockDisplaySyncGroup()
--{
--}
--
--MockDisplaySyncGroup::~MockDisplaySyncGroup()
--{
--}
--
--MockDisplay::MockDisplay()
--{
--}
--
--MockDisplay::~MockDisplay()
--{
--}
 === removed file 'tests/framework/mock_display.h'
 --- tests/framework/mock_display.h	2016-02-19 10:41:15 +0000
 +++ tests/framework/mock_display.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
--/*
-- * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, 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/>.
-- */
--
--#ifndef MOCKDISPLAY_H
--#define MOCKDISPLAY_H
--
--#include <mir/graphics/display.h>
--#include <mir/graphics/gl_context.h>
--#include <mir/version.h>
--
--#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 20, 0)
--#include <mir/graphics/virtual_output.h>
--#endif
--
--#include <gmock/gmock.h>
--#include "gmock_fixes.h"
--
--class MockDisplaySyncGroup : public mir::graphics::DisplaySyncGroup
--{
--public:
--    MockDisplaySyncGroup();
--    virtual ~MockDisplaySyncGroup();
--
--    MOCK_METHOD1(for_each_display_buffer, void(std::function<void(mir::graphics::DisplayBuffer&)> const& f));
--    MOCK_METHOD0(post, void());
--};
--
--struct MockDisplay : public mir::graphics::Display
--{
--public:
--    MockDisplay();
--    virtual ~MockDisplay();
--
--    MOCK_METHOD1(for_each_display_sync_group, void(std::function<void(mir::graphics::DisplaySyncGroup&)> const&));
--    MOCK_CONST_METHOD0(configuration, std::unique_ptr<mir::graphics::DisplayConfiguration>());
--    MOCK_METHOD1(configure, void(mir::graphics::DisplayConfiguration const&));
--    MOCK_METHOD2(register_configuration_change_handler,
--                 void(mir::graphics::EventHandlerRegister&, mir::graphics::DisplayConfigurationChangeHandler const&));
--
--    MOCK_METHOD3(register_pause_resume_handlers, void(mir::graphics::EventHandlerRegister&,
--                                                      mir::graphics::DisplayPauseHandler const&,
--                                                      mir::graphics::DisplayResumeHandler const&));
--    MOCK_METHOD0(pause, void());
--    MOCK_METHOD0(resume, void());
--    MOCK_METHOD1(create_hardware_cursor, std::shared_ptr<mir::graphics::Cursor>(std::shared_ptr<mir::graphics::CursorImage> const&));
--    MOCK_METHOD0(create_gl_context, std::unique_ptr<mir::graphics::GLContext>());
--
--#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 20, 0)
--    MOCK_METHOD2(create_virtual_output, std::unique_ptr<mir::graphics::VirtualOutput> (int width, int height));
--#endif
--};
--
--#endif // MOCKDISPLAY_H
 === removed file 'tests/framework/mock_display_configuration.cpp'
 --- tests/framework/mock_display_configuration.cpp	2015-11-11 10:43:36 +0000
 +++ tests/framework/mock_display_configuration.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
--/*
-- * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, 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/>.
-- */
--
--#include "mock_display_configuration.h"
--
--MockDisplayConfiguration::MockDisplayConfiguration()
--{
--}
--
--MockDisplayConfiguration::~MockDisplayConfiguration()
--{
--}
 === removed file 'tests/framework/mock_display_configuration.h'
 --- tests/framework/mock_display_configuration.h	2016-02-01 12:18:00 +0000
 +++ tests/framework/mock_display_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
--/*
-- * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, 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/>.
-- */
--
--#ifndef MOCK_DISPLAY_CONFIGURATION_H
--#define MOCK_DISPLAY_CONFIGURATION_H
--
--#include <mir/graphics/display_configuration.h>
--
--#include <gmock/gmock.h>
--#include "gmock_fixes.h"
--
--class MockDisplayConfiguration : public mir::graphics::DisplayConfiguration
--{
--public:
--	MockDisplayConfiguration();
--	virtual ~MockDisplayConfiguration();
--
--    MOCK_CONST_METHOD1(for_each_card, void(std::function<void(mir::graphics::DisplayConfigurationCard const&)>));
--
--    MOCK_CONST_METHOD1(for_each_output, void(std::function<void(mir::graphics::DisplayConfigurationOutput const&)>));
--    MOCK_METHOD1(for_each_output, void(std::function<void(mir::graphics::UserDisplayConfigurationOutput&)>));
--    MOCK_CONST_METHOD0(clone, std::unique_ptr<mir::graphics::DisplayConfiguration>());
--
--    MOCK_CONST_METHOD0(valid, bool());
--};
--
--#endif // MOCK_DISPLAY_CONFIGURATION_H
 === removed file 'tests/framework/mock_gl_display_buffer.cpp'
 --- tests/framework/mock_gl_display_buffer.cpp	2015-11-11 10:43:36 +0000
 +++ tests/framework/mock_gl_display_buffer.cpp	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
--/*
-- * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, 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/>.
-- */
--
--#include "mock_gl_display_buffer.h"
--
--MockGLDisplayBuffer::MockGLDisplayBuffer()
--{
--    using namespace testing;
--    ON_CALL(*this, view_area())
--        .WillByDefault(Return(mir::geometry::Rectangle{{0,0},{0,0}}));
--    ON_CALL(*this, native_display_buffer())
--        .WillByDefault(Return(dynamic_cast<mir::graphics::NativeDisplayBuffer*>(this)));
--}
--
--MockGLDisplayBuffer::~MockGLDisplayBuffer()
--{
--}
 === modified file 'tests/framework/mock_gl_display_buffer.h'
 --- tests/framework/mock_gl_display_buffer.h	2016-04-21 16:21:22 +0000
 +++ tests/framework/mock_gl_display_buffer.h	2016-09-07 09:24:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 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
@@ -17,24 +17,16 @@
  #ifndef MOCK_GL_DISPLAY_BUFFER_H
  #define MOCK_GL_DISPLAY_BUFFER_H
--#include <mir/graphics/display_buffer.h>
++#include <mir/test/doubles/null_display_buffer.h>
  #include <mir/renderer/gl/render_target.h>
  #include <gmock/gmock.h>
--class MockGLDisplayBuffer : public mir::graphics::DisplayBuffer,
--                            public mir::renderer::gl::RenderTarget,
--                            public mir::graphics::NativeDisplayBuffer
++class MockGLDisplayBuffer : public mir::test::doubles::NullDisplayBuffer,
++                            public mir::renderer::gl::RenderTarget
+ {
  public:
--    MockGLDisplayBuffer();
--    virtual ~MockGLDisplayBuffer();
--
      MOCK_CONST_METHOD0(view_area, mir::geometry::Rectangle());
--    MOCK_METHOD1(post_renderables_if_optimizable, bool(mir::graphics::RenderableList const&));
--    MOCK_CONST_METHOD0(orientation, MirOrientation());
--    MOCK_CONST_METHOD0(mirror_mode, MirMirrorMode());
--    MOCK_METHOD0(native_display_buffer, mir::graphics::NativeDisplayBuffer*());
      MOCK_METHOD0(make_current, void());
      MOCK_METHOD0(bind, void());
 === modified file 'tests/mirserver/ScreensModel/CMakeLists.txt'
 --- tests/mirserver/ScreensModel/CMakeLists.txt	2016-08-30 12:34:47 +0000
 +++ tests/mirserver/ScreensModel/CMakeLists.txt	2016-09-07 09:24:06 +0000
@@ -18,6 +18,7 @@
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
    ${MIRSERVER_INCLUDE_DIRS}
    ${MIRRENDERERGLDEV_INCLUDE_DIRS}
++  ${MIRTEST_INCLUDE_DIRS}
+ )
  add_executable(ScreensModelTest ${SCREENCONTROLLER_TEST_SOURCES})
 === modified file 'tests/mirserver/ScreensModel/screensmodel_test.cpp'
 --- tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-05-25 15:48:53 +0000
 +++ tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-09-07 09:24:06 +0000
@@ -19,20 +19,26 @@
  #include "stub_display.h"
  #include "mock_main_loop.h"
++#include "mock_gl_display_buffer.h"
  #include "qtcompositor.h"
  #include "fake_displayconfigurationoutput.h"
++#include <mir/test/doubles/stub_display_buffer.h>
++
  #include "testable_screensmodel.h"
  #include "screen.h"
  #include "screenwindow.h"
  #include <QGuiApplication>
++#include <QLoggingCategory>
  using namespace ::testing;
  namespace mg = mir::graphics;
  namespace geom = mir::geometry;
++using StubDisplayBuffer = mir::test::doubles::StubDisplayBuffer;
++
  class ScreensModelTest : public ::testing::Test {
  protected:
      void SetUp() override;
@@ -49,6 +55,9 @@
      setenv("QT_QPA_PLATFORM", "minimal", 1);
      Screen::skipDBusRegistration = true;
++    // We don't want the logging spam cluttering the test results
++    QLoggingCategory::setFilterRules(QStringLiteral("qtmir.*=false"));
++
      screensModel = new TestableScreensModel;
      display = std::make_shared<StubDisplay>();
      compositor = std::make_shared<QtCompositor>();
 === modified file 'tests/mirserver/ScreensModel/stub_display.h'
 --- tests/mirserver/ScreensModel/stub_display.h	2016-08-08 13:55:43 +0000
 +++ tests/mirserver/ScreensModel/stub_display.h	2016-09-07 09:24:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 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
@@ -17,13 +17,17 @@
  #ifndef STUB_DISPLAY_H
  #define STUB_DISPLAY_H
--#include "mock_display.h"
--#include "mock_gl_display_buffer.h"
--#include "mock_display_configuration.h"
--
--namespace mg = mir::graphics;
++#include <mir/test/doubles/null_display.h>
++#include <mir/test/doubles/null_display_sync_group.h>
++namespace mg = mir::graphics; // Bug lp:1614983
++#include <mir/test/doubles/mock_display_configuration.h>
  namespace geom = mir::geometry;
++using NullDisplay = mir::test::doubles::NullDisplay;
++using MockDisplayConfiguration = mir::test::doubles::MockDisplayConfiguration;
++
++class MockGLDisplayBuffer;
++
  class StubDisplayConfiguration : public MockDisplayConfiguration
+ {
  public:
@@ -38,37 +42,27 @@
+         }
+     }
--
--    std::unique_ptr<mg::DisplayConfiguration> clone() const override
--    {
--        return std::make_unique<MockDisplayConfiguration>();
--    }
--
  private:
      const std::vector<mg::DisplayConfigurationOutput> m_config;
  };
--class StubDisplaySyncGroup : public MockDisplaySyncGroup
++class StubDisplaySyncGroup : public mir::test::doubles::NullDisplaySyncGroup
+ {
  public:
--    StubDisplaySyncGroup(MockGLDisplayBuffer *buffer) : buffer(buffer) {}
++    StubDisplaySyncGroup(mg::DisplayBuffer *buffer) : m_buffer(buffer) {}
      void for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& f) override
+     {
--        f(*buffer);
--    }
--    std::chrono::milliseconds recommended_sleep() const override
--    {
--        std::chrono::milliseconds one{1};
--        return one;
--    }
++        f(*m_buffer);
++    }
++
  private:
--    MockGLDisplayBuffer *buffer;
++    mg::DisplayBuffer *m_buffer;
  };
--class StubDisplay : public MockDisplay
++class StubDisplay : public NullDisplay
+ {
  public:
      // Note, GMock cannot mock functions which return non-copyable objects, so stubbing needed
@@ -82,13 +76,13 @@
      void for_each_display_sync_group(std::function<void(mg::DisplaySyncGroup&)> const& f) override
+     {
          for (auto displayBuffer : m_displayBuffers) {
--            StubDisplaySyncGroup b(displayBuffer);
++            StubDisplaySyncGroup b(reinterpret_cast<mg::DisplayBuffer *>(displayBuffer));
              f(b);
+         }
+     }
      void setFakeConfiguration(std::vector<mg::DisplayConfigurationOutput> &config,
--                              std::vector<MockGLDisplayBuffer*> &displayBuffers)
++                              std::vector<MockGLDisplayBuffer*> displayBuffers)
+     {
          m_config = config;
          m_displayBuffers = displayBuffers;

QtMir

Merge lp:~gerboland/qtmir/use-mir-test-dev into lp:qtmir

Commit Message

Description of the Change

Preview Diff

Subscribers