Mir

Merge lp:~alan-griffiths/mir/ClientFocusNotification-test-migration into lp:mir

Proposed by Alan Griffiths on 2017-05-31
Status: Merged
Approved by: Alan Griffiths on 2017-06-06
Approved revision: 4184
Merged at revision: 4185
Proposed branch: lp:~alan-griffiths/mir/ClientFocusNotification-test-migration
Merge into: lp:mir
Diff against target: 49 lines (+6/-14)
1 file modified
tests/acceptance-tests/test_client_focus_notification.cpp (+6/-14)
To merge this branch: bzr merge lp:~alan-griffiths/mir/ClientFocusNotification-test-migration
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-05-31 Approve on 2017-06-05
Mir CI Bot continuous-integration Approve on 2017-05-31
Review via email: mp+324858@code.launchpad.net

Commit message

Migrate ClientFocusNotification tests to RenderSurface APIs

To post a comment you must log in.
4183. By Alan Griffiths on 2017-05-31

Don't need '#define MIR_DEPRECATE_RENDERSURFACES 0' to enable RS APIs

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4182
https://mir-jenkins.ubuntu.com/job/mir-ci/3422/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4663
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4796
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4786
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4786
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4786
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4699/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4699
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4699/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4183
https://mir-jenkins.ubuntu.com/job/mir-ci/3423/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4664
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4797
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4787
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4787
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4787
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4700/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4700
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4700/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
4184. By Alan Griffiths on 2017-05-31

Remove unused headers

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4184
https://mir-jenkins.ubuntu.com/job/mir-ci/3424/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4665
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4798
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4788
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4788
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4788
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4701/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4701
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4701/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/acceptance-tests/test_client_focus_notification.cpp'
2--- tests/acceptance-tests/test_client_focus_notification.cpp 2017-05-08 03:04:26 +0000
3+++ tests/acceptance-tests/test_client_focus_notification.cpp 2017-05-31 16:01:29 +0000
4@@ -18,12 +18,7 @@
5
6 #include "mir_toolkit/mir_client_library.h"
7
8-#include "mir/test/signal.h"
9-#include "mir/test/event_matchers.h"
10-
11 #include "mir_test_framework/connected_client_headless_server.h"
12-#include "mir_test_framework/process.h"
13-#include "mir/test/cross_process_sync.h"
14
15 #include <gtest/gtest.h>
16 #include <gmock/gmock.h>
17@@ -40,19 +35,15 @@
18 FocusSurface(MirConnection* connection) :
19 connection(connection)
20 {
21+ surface = mir_connection_create_render_surface_sync(connection, 100, 100);
22 auto spec = mir_create_normal_window_spec(connection, 100, 100);
23-#pragma GCC diagnostic push
24-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
25- mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888);
26-#pragma GCC diagnostic pop
27 mir_window_spec_set_event_handler(spec, FocusSurface::handle_event, this);
28-
29+ mir_window_spec_add_render_surface(spec, surface, 100, 100, 0, 0);
30 window = mir_create_window_sync(spec);
31 mir_window_spec_release(spec);
32-#pragma GCC diagnostic push
33-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
34- mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
35-#pragma GCC diagnostic pop
36+
37+ mir_buffer_stream_swap_buffers_sync(
38+ mir_render_surface_get_buffer_stream(surface, 100, 100, mir_pixel_format_argb_8888));
39 }
40
41 ~FocusSurface()
42@@ -113,6 +104,7 @@
43 std::vector<MirWindowFocusState> focus_events;
44 bool released {false};
45 MirConnection* connection = nullptr;
46+ MirRenderSurface* surface = nullptr;
47 MirWindow* window = nullptr;
48 std::chrono::seconds timeout{5};
49 };

Subscribers

People subscribed via source and target branches