1
=== modified file 'src/client/android/android_registrar.cpp'
2
--- src/client/android/android_registrar.cpp	2013-06-21 23:35:50 +0000
3
+++ src/client/android/android_registrar.cpp	2013-07-03 17:18:27 +0000
4
@@ -37,6 +37,8 @@
5
37
    void operator()(const native_handle_t* t)
37
    void operator()(const native_handle_t* t)
6
38
    {
38
    {
7
39
        module->unregisterBuffer(module.get(), t);
39
        module->unregisterBuffer(module.get(), t);
8
40
        for(auto i=0; i < t->numFds; i++)
9
41
            close(t->data[i]);
10
40
        ::operator delete(const_cast<native_handle_t*>(t));
42
        ::operator delete(const_cast<native_handle_t*>(t));
11
41
    }
43
    }
12
42
private:
44
private:
13
43
45
14
=== modified file 'tests/unit-tests/client/android/test_client_android_registrar.cpp'
15
--- tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-06-21 23:04:37 +0000
16
+++ tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-07-03 17:18:27 +0000
17
@@ -19,9 +19,12 @@
18
19
#include "src/client/android/android_client_buffer.h"
19
#include "src/client/android/android_client_buffer.h"
19
20
#include "src/client/android/android_registrar_gralloc.h"
20
#include "src/client/android/android_registrar_gralloc.h"
20
21
#include "mir_test_doubles/mock_android_alloc_device.h"
21
#include "mir_test_doubles/mock_android_alloc_device.h"
21
22
#include "mir_test/fake_shared.h"
22
22
23
23
23
#include <system/graphics.h>
24
#include <system/graphics.h>
24
24
#include <stdexcept>
25
#include <stdexcept>
25
26
#include <unistd.h>
26
27
#include <fcntl.h>
27
25
28
28
26
#include <gtest/gtest.h>
29
#include <gtest/gtest.h>
29
27
#include <gmock/gmock.h>
30
#include <gmock/gmock.h>
30
@@ -82,6 +85,7 @@
31
82
        return registrar->unlock_interface(module, handle);
85
        return registrar->unlock_interface(module, handle);
32
83
    }
86
    }
33
84
};
87
};
34
88
typedef ::testing::NiceMock<MockRegistrarDevice> StubRegistrarDevice;
35
85
89
36
86
class ClientAndroidRegistrarTest : public ::testing::Test
90
class ClientAndroidRegistrarTest : public ::testing::Test
37
87
{
91
{
38
@@ -90,7 +94,7 @@
39
90
    {
94
    {
40
91
        using namespace testing;
95
        using namespace testing;
41
92
96
43
93
        mock_module = std::make_shared<MockRegistrarDevice>();
97
        mock_module = std::make_shared<NiceMock<MockRegistrarDevice>>();
44
94
98
45
95
        width = 41;
99
        width = 41;
46
96
        height = 43;
100
        height = 43;
47
@@ -158,6 +162,24 @@
48
158
    EXPECT_EQ(handle1, handle2);
162
    EXPECT_EQ(handle1, handle2);
49
159
}
163
}
50
160
164
51
165
TEST_F(ClientAndroidRegistrarTest, registrar_frees_fds)
52
166
{
53
167
    using namespace testing;
54
168
    StubRegistrarDevice stub_module;
55
169
    auto package = std::make_shared<MirBufferPackage>();
56
170
    package->data_items = 0;
57
171
    package->fd_items = 2;
58
172
    pipe(static_cast<int*>(package->fd));
59
173
60
174
    {
61
175
        mcla::AndroidRegistrarGralloc registrar(mir::test::fake_shared(stub_module));
62
176
        auto handle = registrar.register_buffer(package);
63
177
    }
64
178
65
179
    EXPECT_EQ(-1, fcntl(package->fd[0], F_GETFD));
66
180
    EXPECT_EQ(-1, fcntl(package->fd[1], F_GETFD));
67
181
}
68
182
69
161
183
70
162
TEST_F(ClientAndroidRegistrarTest, register_failure)
184
TEST_F(ClientAndroidRegistrarTest, register_failure)
71
163
{
185
{
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-03
Alan Griffiths			Abstain on 2013-07-03
Alexandros Frantzis (community)		2013-07-02	Approve on 2013-07-03
Review via email: mp+172667@code.launchpad.net