1
=== modified file 'debian/changelog'
2
--- debian/changelog	2014-07-09 10:15:33 +0000
3
+++ debian/changelog	2014-07-15 22:21:04 +0000
4
@@ -1,13 +1,3 @@
5
1
dbus-cpp (3.0.0+14.10.20140709.2-0ubuntu1) utopic; urgency=low
6
2
7
3
  [ Ubuntu daily release ]
8
4
  * New rebuild forced
9
5
10
6
  [ Antti Kaijanmäki ]
11
7
  * Fix read-only property PropertiesChanged updates. (LP: #1339589)
12
8
13
9
 -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 09 Jul 2014 10:15:33 +0000
14
10
15
11
dbus-cpp (3.0.0+14.10.20140612-0ubuntu1) utopic; urgency=low
1
dbus-cpp (3.0.0+14.10.20140612-0ubuntu1) utopic; urgency=low
16
12
2
17
13
  [ Manuel de la Peña ]
3
  [ Manuel de la Peña ]
18
14
4
19
=== modified file 'include/core/dbus/impl/property.h'
20
--- include/core/dbus/impl/property.h	2014-06-10 08:44:17 +0000
21
+++ include/core/dbus/impl/property.h	2014-07-15 22:21:04 +0000
22
@@ -161,14 +161,10 @@
23
161
    try
161
    try
24
162
    {
162
    {
25
163
        auto value = arg.as<typename PropertyType::ValueType>();
163
        auto value = arg.as<typename PropertyType::ValueType>();
30
164
        Super::set(value);
164
        set(value);
27
165
    }
28
166
    catch (const std::exception &e){
29
167
        std::cout << __PRETTY_FUNCTION__ << ": " << e.what() << std::endl;
31
168
    }
165
    }
32
169
    catch (...)
166
    catch (...)
33
170
    {
167
    {
34
171
        std::cout << __PRETTY_FUNCTION__ << ": " << "Unknown exception." << std::endl;
35
172
    }
168
    }
36
173
}
169
}
37
174
}
170
}
38
175
171
39
=== modified file 'include/core/dbus/service.h'
40
--- include/core/dbus/service.h	2013-11-27 18:57:42 +0000
41
+++ include/core/dbus/service.h	2014-07-15 22:21:04 +0000
42
@@ -60,28 +60,53 @@
43
60
    typedef std::shared_ptr<Service> Ptr;    
60
    typedef std::shared_ptr<Service> Ptr;    
44
61
61
45
62
    /**
62
    /**
47
63
     * @brief Exposes a service on the bus.
63
     * @brief Exposes a service on the bus, trying to acquire the given name.
48
64
     * @returns An instance of Service or nullptr in case of errors.
64
     * @returns An instance of Service or nullptr in case of errors.
49
65
     * @tparam Interface Needs to a model of concept Service.
65
     * @tparam Interface Needs to a model of concept Service.
50
66
     * @param [in] connection Bus to expose the service upon.
66
     * @param [in] connection Bus to expose the service upon.
51
67
     * @param [in] name The name to acquire for this service.
52
67
     * @param [in] flags Flags specifying behavior when requesting a name on the bus.
68
     * @param [in] flags Flags specifying behavior when requesting a name on the bus.
53
68
     */
69
     */
54
69
    template<typename Interface>
55
70
    inline static Ptr add_service(
70
    inline static Ptr add_service(
56
71
        const Bus::Ptr& connection,
71
        const Bus::Ptr& connection,
57
72
        const std::string& name,
58
72
        const Bus::RequestNameFlag& flags =
73
        const Bus::RequestNameFlag& flags =
59
73
            Bus::RequestNameFlag::do_not_queue |
74
            Bus::RequestNameFlag::do_not_queue |
60
74
            Bus::RequestNameFlag::replace_existing)
75
            Bus::RequestNameFlag::replace_existing)
61
75
    {
76
    {
63
76
        static Ptr instance(
77
        Ptr instance(
64
77
            new Service(
78
            new Service(
67
78
                connection, 
79
                connection,
68
79
                traits::Service<Interface>::interface_name(), 
80
                name,
69
80
                flags));
81
                flags));
70
81
        return instance;
82
        return instance;
71
82
    }
83
    }
72
83
84
73
84
    /**
85
    /**
74
86
     * @brief Exposes a service on the bus.
75
87
     * @returns An instance of Service or nullptr in case of errors.
76
88
     * @tparam Interface Needs to a model of concept Service.
77
89
     * @param [in] connection Bus to expose the service upon.
78
90
     * @param [in] flags Flags specifying behavior when requesting a name on the bus.
79
91
     */
80
92
    template<typename Interface>
81
93
    inline static Ptr add_service(
82
94
        const Bus::Ptr& connection,
83
95
        const Bus::RequestNameFlag& flags =
84
96
            Bus::RequestNameFlag::do_not_queue |
85
97
            Bus::RequestNameFlag::replace_existing)
86
98
    {
87
99
        static Ptr instance
88
100
        {
89
101
            add_service(connection,
90
102
                        traits::Service<Interface>::interface_name(),
91
103
                        flags)
92
104
        };
93
105
94
106
        return instance;
95
107
    }
96
108
97
109
    /**
98
85
     * @brief Provides access to a service on the bus via a proxy object.
110
     * @brief Provides access to a service on the bus via a proxy object.
99
86
     * @returns An instance of Service or nullptr in case of errors.
111
     * @returns An instance of Service or nullptr in case of errors.
100
87
     * @tparam Interface Needs to be a model of concept Service.
112
     * @tparam Interface Needs to be a model of concept Service.
101
88
113
102
=== modified file 'tests/service_test.cpp'
103
--- tests/service_test.cpp	2014-06-10 08:44:17 +0000
104
+++ tests/service_test.cpp	2014-07-15 22:21:04 +0000
105
@@ -82,25 +82,11 @@
106
82
            auto writable_property = skeleton->get_property<test::Service::Properties::Dummy>();
82
            auto writable_property = skeleton->get_property<test::Service::Properties::Dummy>();
107
83
            writable_property->set(expected_value);
83
            writable_property->set(expected_value);
108
84
84
113
85
            auto readonly_property = skeleton->get_property<test::Service::Properties::ReadOnly>();
85
            skeleton->install_method_handler<test::Service::Method>([bus, skeleton, expected_value](const dbus::Message::Ptr& msg)
110
86
            readonly_property->set(7);
111
87
112
88
            skeleton->install_method_handler<test::Service::Method>([bus, skeleton, &readonly_property, expected_value](const dbus::Message::Ptr& msg)
114
89
            {
86
            {
115
90
                auto reply = dbus::Message::make_method_return(msg);
87
                auto reply = dbus::Message::make_method_return(msg);
116
91
                reply->writer() << expected_value;
88
                reply->writer() << expected_value;
117
92
                bus->send(reply);
89
                bus->send(reply);
118
93
119
94
                readonly_property->set(expected_value);
120
95
                auto changed_signal = skeleton->get_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged>();
121
96
                core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType
122
97
                        args("this.is.unlikely.to.exist.Service",
123
98
                             {{test::Service::Properties::ReadOnly::name(),
124
99
                               core::dbus::types::TypedVariant<test::Service::Properties::ReadOnly::ValueType>(expected_value)}},
125
100
                             {});
126
101
                skeleton->emit_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged, core::dbus::interfaces::Properties::Signals::PropertiesChanged::ArgumentType>(args);
127
102
                changed_signal->emit(args);
128
103
129
104
                skeleton->emit_signal<test::Service::Signals::Dummy, int64_t>(expected_value);
90
                skeleton->emit_signal<test::Service::Signals::Dummy, int64_t>(expected_value);
130
105
            });
91
            });
131
106
92
132
@@ -132,14 +118,6 @@
133
132
            {
118
            {
134
133
                std::cout << "Dummy property changed: " << d << std::endl;
119
                std::cout << "Dummy property changed: " << d << std::endl;
135
134
            });
120
            });
136
135
137
136
            auto readonly_property = stub->get_property<test::Service::Properties::ReadOnly>();
138
137
            EXPECT_EQ(readonly_property->get(), 7);
139
138
            std::uint32_t changed_value = 0;
140
139
            readonly_property->changed().connect([&changed_value](std::uint32_t value){
141
140
                changed_value = value;
142
141
            });
143
142
144
143
            auto signal = stub->get_signal<test::Service::Signals::Dummy>();
121
            auto signal = stub->get_signal<test::Service::Signals::Dummy>();
145
144
            int64_t received_signal_value = -1;
122
            int64_t received_signal_value = -1;
146
145
            signal->connect([bus, &received_signal_value](const int32_t& value)
123
            signal->connect([bus, &received_signal_value](const int32_t& value)
147
@@ -166,8 +144,6 @@
148
166
                t.join();
144
                t.join();
149
167
145
150
168
            EXPECT_EQ(expected_value, received_signal_value);
146
            EXPECT_EQ(expected_value, received_signal_value);
151
169
            EXPECT_EQ(expected_value, readonly_property->get());
152
170
            EXPECT_EQ(changed_value, expected_value);
153
171
147
154
172
            return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
148
            return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
155
173
        };
149
        };
156
174
150
157
=== modified file 'tests/test_service.h'
158
--- tests/test_service.h	2014-06-03 08:25:03 +0000
159
+++ tests/test_service.h	2014-07-15 22:21:04 +0000
160
@@ -68,18 +68,6 @@
161
68
            static const bool readable = true;
68
            static const bool readable = true;
162
69
            static const bool writable = true;
69
            static const bool writable = true;
163
70
        };
70
        };
164
71
165
72
        struct ReadOnly
166
73
        {
167
74
            inline static std::string name()
168
75
            {
169
76
                return "ReadOnly";
170
77
            };
171
78
            typedef Service Interface;
172
79
            typedef std::uint32_t ValueType;
173
80
            static const bool readable = true;
174
81
            static const bool writable = false;
175
82
        };
176
83
    };
71
    };
177
84
72
178
85
    struct Interfaces
73
    struct Interfaces
Status:	Rejected
Rejected by:	Thomas Voß on 2014-07-15
Proposed branch:	lp:~thomas-voss/dbus-cpp/add_service_with_custom_name
Merge into:	lp:dbus-cpp
Diff against target:	178 lines (+32/-57) 5 files modified debian/changelog (+0/-10) include/core/dbus/impl/property.h (+1/-5) include/core/dbus/service.h (+30/-5) tests/service_test.cpp (+1/-25) tests/test_service.h (+0/-12)
To merge this branch:	bzr merge lp:~thomas-voss/dbus-cpp/add_service_with_custom_name
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-07-15
Manuel de la Peña (community)			Approve on 2014-07-15
Pete Woods (community)		2014-07-02	Approve on 2014-07-15
Review via email: mp+225332@code.launchpad.net