1
=== modified file 'configure.ac'
2
--- configure.ac	2013-01-22 20:30:05 +0000
3
+++ configure.ac	2013-06-07 21:40:41 +0000
4
@@ -75,7 +75,7 @@
5
75
AC_SUBST(COVERAGE_LDFLAGS)
75
AC_SUBST(COVERAGE_LDFLAGS)
6
76
76
7
77
###########################
77
###########################
9
78
# Google Test framework
78
# Tests
10
79
###########################
79
###########################
11
80
80
12
81
AC_ARG_ENABLE([tests],
81
AC_ARG_ENABLE([tests],
13
@@ -85,10 +85,16 @@
14
85
if test "x$enable_tests" != "xno"; then
85
if test "x$enable_tests" != "xno"; then
15
86
    m4_include([m4/gtest.m4])
86
    m4_include([m4/gtest.m4])
16
87
    CHECK_GTEST
87
    CHECK_GTEST
21
88
    if test "x$enable_tests" = "xauto"; then
88
    AM_PATH_PYTHON(3.0,, [:])
22
89
        enable_tests=${have_gtest}
89
    AC_PYTHON_MODULE(dbusmock)
23
90
    elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then
90
    if test "x$have_gtest" = "xyes" -a "x$HAVE_PYMOD_DBUSMOCK" = "xyes"; then
24
91
        AC_MSG_ERROR([tests were requested but gtest is not installed.])
91
        enable_tests="yes"
25
92
    else
26
93
        if test "x$enable_tests" = "xyes"; then
27
94
            AC_MSG_ERROR([tests were requested but gtest or dbusmock are not installed.])
28
95
        else
29
96
            enable_tests="no"
30
97
        fi
31
92
    fi
98
    fi
32
93
fi
99
fi
33
94
AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"])
100
AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"])
34
@@ -193,7 +199,7 @@
35
193
199
36
194
	Prefix:        $prefix
200
	Prefix:        $prefix
37
195
	Indicator Dir: $INDICATORDIR
201
	Indicator Dir: $INDICATORDIR
39
196
	gtest:         $enable_tests
202
	tests:         $enable_tests
40
197
	gcov:          $use_gcov
203
	gcov:          $use_gcov
41
198
	introspecion:  $enable_introspection
204
	introspecion:  $enable_introspection
42
199
	documentation: $enable_gtk_doc
205
	documentation: $enable_gtk_doc
43
200
206
44
=== modified file 'debian/control'
45
--- debian/control	2013-06-07 12:19:11 +0000
46
+++ debian/control	2013-06-07 21:40:41 +0000
47
@@ -19,6 +19,7 @@
48
19
               libgirepository1.0-dev (>= 0.9.12),
19
               libgirepository1.0-dev (>= 0.9.12),
49
20
               gtk-doc-tools,
20
               gtk-doc-tools,
50
21
               libgtest-dev,
21
               libgtest-dev,
51
22
               python3-dbusmock,
52
22
Standards-Version: 3.9.3
23
Standards-Version: 3.9.3
53
23
Homepage: https://launchpad.net/indicator-messages
24
Homepage: https://launchpad.net/indicator-messages
54
24
# If you aren't a member of ~indicator-applet-developers but need to upload
25
# If you aren't a member of ~indicator-applet-developers but need to upload
55
25
26
56
=== modified file 'libmessaging-menu/messaging-menu.c'
57
--- libmessaging-menu/messaging-menu.c	2013-05-15 16:09:18 +0000
58
+++ libmessaging-menu/messaging-menu.c	2013-06-07 21:40:41 +0000
59
@@ -277,6 +277,10 @@
60
277
277
61
278
  if (app->messages_service)
278
  if (app->messages_service)
62
279
    {
279
    {
63
280
      indicator_messages_service_call_application_stopped_running (app->messages_service,
64
281
                                                                   g_app_info_get_id (G_APP_INFO (app->appinfo)),
65
282
                                                                   NULL, NULL, NULL);
66
283
67
280
      g_signal_handlers_disconnect_by_func (app->messages_service,
284
      g_signal_handlers_disconnect_by_func (app->messages_service,
68
281
                                            global_status_changed,
285
                                            global_status_changed,
69
282
                                            app);
286
                                            app);
70
283
287
71
=== added file 'm4/ax_python_module.m4'
72
--- m4/ax_python_module.m4	1970-01-01 00:00:00 +0000
73
+++ m4/ax_python_module.m4	2013-06-07 21:40:41 +0000
74
@@ -0,0 +1,49 @@
75
1
# ===========================================================================
76
2
#     http://www.gnu.org/software/autoconf-archive/ax_python_module.html
77
3
# ===========================================================================
78
4
#
79
5
# SYNOPSIS
80
6
#
81
7
#   AX_PYTHON_MODULE(modname[, fatal])
82
8
#
83
9
# DESCRIPTION
84
10
#
85
11
#   Checks for Python module.
86
12
#
87
13
#   If fatal is non-empty then absence of a module will trigger an error.
88
14
#
89
15
# LICENSE
90
16
#
91
17
#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
92
18
#
93
19
#   Copying and distribution of this file, with or without modification, are
94
20
#   permitted in any medium without royalty provided the copyright notice
95
21
#   and this notice are preserved. This file is offered as-is, without any
96
22
#   warranty.
97
23
98
24
#serial 5
99
25
100
26
AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
101
27
AC_DEFUN([AX_PYTHON_MODULE],[
102
28
    if test -z $PYTHON;
103
29
    then
104
30
        PYTHON="python"
105
31
    fi
106
32
    PYTHON_NAME=`basename $PYTHON`
107
33
    AC_MSG_CHECKING($PYTHON_NAME module: $1)
108
34
	$PYTHON -c "import $1" 2>/dev/null
109
35
	if test $? -eq 0;
110
36
	then
111
37
		AC_MSG_RESULT(yes)
112
38
		eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
113
39
	else
114
40
		AC_MSG_RESULT(no)
115
41
		eval AS_TR_CPP(HAVE_PYMOD_$1)=no
116
42
		#
117
43
		if test -n "$2"
118
44
		then
119
45
			AC_MSG_ERROR(failed to find required module $1)
120
46
			exit 1
121
47
		fi
122
48
	fi
123
49
])
124
0
50
125
=== modified file 'src/messages-service.c'
126
--- src/messages-service.c	2013-04-03 15:40:56 +0000
127
+++ src/messages-service.c	2013-06-07 21:40:41 +0000
128
@@ -474,6 +474,29 @@
129
474
}
474
}
130
475
475
131
476
static void
476
static void
132
477
application_stopped_running (IndicatorMessagesService *service,
133
478
			     GDBusMethodInvocation    *invocation,
134
479
			     const gchar              *desktop_id,
135
480
			     gpointer                  user_data)
136
481
{
137
482
	GDesktopAppInfo *appinfo;
138
483
	gchar *id;
139
484
	AppSection *section;
140
485
141
486
	indicator_messages_service_complete_application_stopped_running (service, invocation);
142
487
143
488
	if (!(appinfo = g_desktop_app_info_new (desktop_id)))
144
489
		return;
145
490
146
491
	id = g_app_info_get_simple_id (G_APP_INFO (appinfo));
147
492
	section = g_hash_table_lookup (applications, id);
148
493
	app_section_unset_object_path (section);
149
494
150
495
	g_free (id);
151
496
	g_object_unref (appinfo);
152
497
}
153
498
154
499
static void
155
477
set_status (IndicatorMessagesService *service,
500
set_status (IndicatorMessagesService *service,
156
478
	    GDBusMethodInvocation *invocation,
501
	    GDBusMethodInvocation *invocation,
157
479
	    const gchar *desktop_id,
502
	    const gchar *desktop_id,
158
@@ -650,6 +673,8 @@
159
650
			  G_CALLBACK (register_application), NULL);
673
			  G_CALLBACK (register_application), NULL);
160
651
	g_signal_connect (messages_service, "handle-unregister-application",
674
	g_signal_connect (messages_service, "handle-unregister-application",
161
652
			  G_CALLBACK (unregister_application), NULL);
675
			  G_CALLBACK (unregister_application), NULL);
162
676
	g_signal_connect (messages_service, "handle-application-stopped-running",
163
677
			  G_CALLBACK (application_stopped_running), NULL);
164
653
	g_signal_connect (messages_service, "handle-set-status",
678
	g_signal_connect (messages_service, "handle-set-status",
165
654
			  G_CALLBACK (set_status), NULL);
679
			  G_CALLBACK (set_status), NULL);
166
655
680
167
656
681
168
=== modified file 'src/messages-service.xml'
169
--- src/messages-service.xml	2012-09-18 19:54:37 +0000
170
+++ src/messages-service.xml	2013-06-07 21:40:41 +0000
171
@@ -11,6 +11,10 @@
172
11
		    <arg type="s" name="desktop_id" direction="in" />
11
		    <arg type="s" name="desktop_id" direction="in" />
173
12
		</method>
12
		</method>
174
13
13
175
14
		<method name="ApplicationStoppedRunning">
176
15
			<arg type="s" name="desktop_id" direction="in" />
177
16
		</method>
178
17
179
14
		<method name="SetStatus">
18
		<method name="SetStatus">
180
15
			<arg type="s" name="desktop_id" direction="in" />
19
			<arg type="s" name="desktop_id" direction="in" />
181
16
			<arg type="s" name="status" direction="in" />
20
			<arg type="s" name="status" direction="in" />
182
17
21
183
=== modified file 'test/Makefile.am'
184
--- test/Makefile.am	2012-08-21 10:07:19 +0000
185
+++ test/Makefile.am	2013-06-07 21:40:41 +0000
186
@@ -65,3 +65,14 @@
187
65
65
188
66
libindicator_messages_service_la_LDFLAGS = \
66
libindicator_messages_service_la_LDFLAGS = \
189
67
	$(COVERAGE_LDFLAGS)
67
	$(COVERAGE_LDFLAGS)
190
68
191
69
######################################
192
70
# Test client with dbusmock
193
71
######################################
194
72
195
73
TESTS_ENVIRONMENT = \
196
74
	export LD_LIBRARY_PATH=$(top_builddir)/libmessaging-menu/.libs; \
197
75
	export GI_TYPELIB_PATH=$(top_builddir)/libmessaging-menu; \
198
76
	export XDG_DATA_DIRS=$(abs_srcdir);
199
77
200
78
TESTS += test-client.py
201
68
79
202
=== added directory 'test/applications'
203
=== added file 'test/applications/test.desktop'
204
--- test/applications/test.desktop	1970-01-01 00:00:00 +0000
205
+++ test/applications/test.desktop	2013-06-07 21:40:41 +0000
206
@@ -0,0 +1,2 @@
207
1
[Desktop Entry]
208
2
Type=Application
209
0
3
210
=== added file 'test/test-client.py'
211
--- test/test-client.py	1970-01-01 00:00:00 +0000
212
+++ test/test-client.py	2013-06-07 21:40:41 +0000
213
@@ -0,0 +1,75 @@
214
1
#!/usr/bin/env python3
215
2
216
3
import unittest
217
4
import dbus
218
5
from dbus.mainloop.glib import DBusGMainLoop
219
6
import dbusmock
220
7
import subprocess
221
8
from gi.repository import GLib, Gio, MessagingMenu
222
9
223
10
DBusGMainLoop(set_as_default=True)
224
11
225
12
class MessagingMenuTest(dbusmock.DBusTestCase):
226
13
    @classmethod
227
14
    def setUpClass(klass):
228
15
        klass.start_session_bus()
229
16
        klass.bus = klass.get_dbus(False)
230
17
231
18
    def setUp(self):
232
19
        name = 'com.canonical.indicator.messages'
233
20
        obj_path = '/com/canonical/indicator/messages/service'
234
21
        iface = 'com.canonical.indicator.messages.service'
235
22
236
23
        self.messaging_service = self.spawn_server(name, obj_path, iface, stdout=subprocess.PIPE)
237
24
        self.mock = dbus.Interface(self.bus.get_object(name, obj_path), dbusmock.MOCK_IFACE)
238
25
        self.mock.AddMethod('', 'RegisterApplication', 'so', '', '')
239
26
        self.mock.AddMethod('', 'UnregisterApplication', 's', '', '')
240
27
        self.mock.AddMethod('', 'ApplicationStoppedRunning', 's', '', '')
241
28
        self.mock.AddMethod('', 'SetStatus', 'ss', '', '')
242
29
243
30
        self.loop = GLib.MainLoop()
244
31
245
32
    def tearDown(self):
246
33
        self.messaging_service.terminate()
247
34
        self.messaging_service.wait()
248
35
249
36
    def assertArgumentsEqual(self, args, *expected_args):
250
37
        self.assertEqual(len(args), len(expected_args))
251
38
        for i in range(len(args)):
252
39
            if expected_args[i]:
253
40
                self.assertEqual(args[i], expected_args[i])
254
41
255
42
    def assertMethodCalled(self, name, *expected_args):
256
43
        # set a flag on timeout, assertions don't get bubbled up through c functions
257
44
        self.timed_out = False
258
45
        def timeout(): self.timed_out = True
259
46
        timeout_id = GLib.timeout_add_seconds(10, timeout)
260
47
        while 1:
261
48
            calls = self.mock.GetMethodCalls(name)
262
49
            if len(calls) > 0:
263
50
                GLib.source_remove(timeout_id)
264
51
                self.assertArgumentsEqual(calls[0][1], *expected_args)
265
52
                break
266
53
            GLib.MainContext.default().iteration(True)
267
54
            if self.timed_out:
268
55
                raise self.failureException('method %s was not called after 10 seconds' % name)
269
56
270
57
    def test_registration(self):
271
58
        mmapp = MessagingMenu.App.new('test.desktop')
272
59
        mmapp.register()
273
60
        self.assertMethodCalled('RegisterApplication', 'test.desktop', None)
274
61
275
62
        mmapp.unregister()
276
63
        self.assertMethodCalled('UnregisterApplication', 'test.desktop')
277
64
278
65
        # ApplicationStoppedRunning is called when the last ref on mmapp is dropped
279
66
        del mmapp
280
67
        self.assertMethodCalled('ApplicationStoppedRunning', 'test.desktop')
281
68
282
69
    def test_status(self):
283
70
        mmapp = MessagingMenu.App.new('test.desktop')
284
71
        mmapp.register()
285
72
        mmapp.set_status(MessagingMenu.Status.AWAY)
286
73
        self.assertMethodCalled('SetStatus', 'test.desktop', 'away')
287
74
288
75
unittest.main(testRunner=unittest.TextTestRunner())
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-06-07	Approve on 2013-06-07
Ted Gould (community)			Approve on 2013-06-07
Mathieu Trudel-Lapierre		2013-06-07	Pending
Review via email: mp+168202@code.launchpad.net