URL Dispatcher

Merge lp:~ted/url-dispatcher/ubuntu-app-launch into lp:url-dispatcher/14.10

  1. ubuntu-app-launch
  2. Merge into trunk.14.10
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 53
Merged at revision: 52
Proposed branch: lp:~ted/url-dispatcher/ubuntu-app-launch
Merge into: lp:url-dispatcher/14.10
Diff against target: 416 lines (+69/-69)
10 files modified
CMakeLists.txt (+2/-2)
debian/control (+2/-2)
service/CMakeLists.txt (+1/-1)
service/dispatcher.c (+4/-4)
tests/CMakeLists.txt (+5/-5)
tests/app-id-test.cc (+26/-26)
tests/dispatcher-test.cc (+20/-20)
tests/service-test.cc (+1/-1)
tests/ubuntu-app-launch-mock.c (+6/-6)
tests/ubuntu-app-launch-mock.h (+2/-2)
To merge this branch: bzr merge lp:~ted/url-dispatcher/ubuntu-app-launch
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+220955@code.launchpad.net

Commit message

Changing to Ubuntu App Launch

Description of the change

We have a name

To post a comment you must log in.
lp:~ted/url-dispatcher/ubuntu-app-launch updated
53. By Ted Gould

Missed a build variable

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/109/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/109/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/110/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Jenkins won't be happy with this without the rest of the train.

The code looks alright; approving despite Jenkins' disapproval.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-01-08 22:30:15 +0000
+++ CMakeLists.txt 2014-05-26 13:09:13 +0000
@@ -29,8 +29,8 @@
2929
30set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")30set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
3131
32pkg_check_modules(UPSTART_APP_LAUNCH REQUIRED upstart-app-launch-2)32pkg_check_modules(UBUNTU_APP_LAUNCH REQUIRED ubuntu-app-launch-2)
33include_directories(${UPSTART_APP_LAUNCH_INCLUDE_DIRS})33include_directories(${UBUNTU_APP_LAUNCH_INCLUDE_DIRS})
3434
35pkg_check_modules(GLIB2 REQUIRED glib-2.0)35pkg_check_modules(GLIB2 REQUIRED glib-2.0)
36include_directories(${GLIB2_INCLUDE_DIRS})36include_directories(${GLIB2_INCLUDE_DIRS})
3737
=== modified file 'debian/control'
--- debian/control 2014-01-29 14:55:59 +0000
+++ debian/control 2014-05-26 13:09:13 +0000
@@ -15,7 +15,7 @@
15 libjson-glib-dev,15 libjson-glib-dev,
16 libgtest-dev,16 libgtest-dev,
17 libsqlite3-dev,17 libsqlite3-dev,
18 libupstart-app-launch2-dev (>= 0.3),18 libubuntu-app-launch2-dev (>= 0.3),
19 python,19 python,
20 python3-dbusmock,20 python3-dbusmock,
21 sqlite3,21 sqlite3,
@@ -31,7 +31,7 @@
31Architecture: any31Architecture: any
32Multi-Arch: same32Multi-Arch: same
33Pre-Depends: ${misc:Pre-Depends},33Pre-Depends: ${misc:Pre-Depends},
34Depends: upstart-app-launch,34Depends: ubuntu-app-launch,
35 ${misc:Depends},35 ${misc:Depends},
36 ${shlibs:Depends},36 ${shlibs:Depends},
37Description: service to allow sending of URLs and get handlers started37Description: service to allow sending of URLs and get handlers started
3838
=== modified file 'service/CMakeLists.txt'
--- service/CMakeLists.txt 2014-03-14 19:47:07 +0000
+++ service/CMakeLists.txt 2014-05-26 13:09:13 +0000
@@ -84,7 +84,7 @@
8484
85set_target_properties(service-exec PROPERTIES OUTPUT_NAME "url-dispatcher")85set_target_properties(service-exec PROPERTIES OUTPUT_NAME "url-dispatcher")
8686
87target_link_libraries(service-exec dispatcher-lib ${UPSTART_APP_LAUNCH_LIBRARIES})87target_link_libraries(service-exec dispatcher-lib ${UBUNTU_APP_LAUNCH_LIBRARIES})
8888
89###########################89###########################
90# Update Directory90# Update Directory
9191
=== modified file 'service/dispatcher.c'
--- service/dispatcher.c 2014-03-14 19:51:28 +0000
+++ service/dispatcher.c 2014-05-26 13:09:13 +0000
@@ -19,7 +19,7 @@
1919
20#include <gio/gio.h>20#include <gio/gio.h>
21#include <json-glib/json-glib.h>21#include <json-glib/json-glib.h>
22#include <upstart-app-launch.h>22#include <ubuntu-app-launch.h>
23#include "dispatcher.h"23#include "dispatcher.h"
24#include "service-iface.h"24#include "service-iface.h"
25#include "recoverable-problem.h"25#include "recoverable-problem.h"
@@ -131,7 +131,7 @@
131 NULL131 NULL
132 };132 };
133133
134 if (!upstart_app_launch_start_application(app_id, urls)) {134 if (!ubuntu_app_launch_start_application(app_id, urls)) {
135 g_warning("Unable to start application '%s' with URL '%s'", app_id, url);135 g_warning("Unable to start application '%s' with URL '%s'", app_id, url);
136 }136 }
137137
@@ -170,7 +170,7 @@
170 gchar * appid = NULL;170 gchar * appid = NULL;
171 gboolean retval = FALSE;171 gboolean retval = FALSE;
172172
173 appid = upstart_app_launch_triplet_to_app_id(package, app, version);173 appid = ubuntu_app_launch_triplet_to_app_id(package, app, version);
174 if (appid != NULL) {174 if (appid != NULL) {
175 pass_url_to_app(appid, NULL);175 pass_url_to_app(appid, NULL);
176 retval = TRUE;176 retval = TRUE;
@@ -205,7 +205,7 @@
205 gboolean retval = FALSE;205 gboolean retval = FALSE;
206 gchar * appid = NULL;206 gchar * appid = NULL;
207207
208 appid = upstart_app_launch_triplet_to_app_id("com.ubuntu.music", "music", NULL);208 appid = ubuntu_app_launch_triplet_to_app_id("com.ubuntu.music", "music", NULL);
209 if (appid != NULL) {209 if (appid != NULL) {
210 pass_url_to_app(appid, url);210 pass_url_to_app(appid, url);
211 retval = TRUE;211 retval = TRUE;
212212
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2014-03-24 20:37:42 +0000
+++ tests/CMakeLists.txt 2014-05-26 13:09:13 +0000
@@ -25,8 +25,8 @@
2525
26add_library(mock-lib STATIC26add_library(mock-lib STATIC
27 recoverable-problem-mock.c27 recoverable-problem-mock.c
28 upstart-app-launch-mock.h28 ubuntu-app-launch-mock.h
29 upstart-app-launch-mock.c)29 ubuntu-app-launch-mock.c)
3030
31target_link_libraries(mock-lib31target_link_libraries(mock-lib
32 ${GLIB2_LIBRARIES}32 ${GLIB2_LIBRARIES}
@@ -43,7 +43,7 @@
43 dispatcher-lib43 dispatcher-lib
44 mock-lib44 mock-lib
45 gtest45 gtest
46 ${UPSTART_APP_LAUNCH_LIBRARIES}46 ${UBUNTU_APP_LAUNCH_LIBRARIES}
47 ${GTEST_LIBS})47 ${GTEST_LIBS})
4848
49add_test (dispatcher-test dispatcher-test)49add_test (dispatcher-test dispatcher-test)
@@ -62,7 +62,7 @@
62 dispatcher-lib62 dispatcher-lib
63 mock-lib63 mock-lib
64 gtest64 gtest
65 ${UPSTART_APP_LAUNCH_LIBRARIES}65 ${UBUNTU_APP_LAUNCH_LIBRARIES}
66 ${GTEST_LIBS})66 ${GTEST_LIBS})
6767
68add_test (app-id-test app-id-test)68add_test (app-id-test app-id-test)
@@ -91,7 +91,7 @@
91 dispatcher91 dispatcher
92 gtest92 gtest
93 ${DBUSTEST_LIBRARIES}93 ${DBUSTEST_LIBRARIES}
94 ${UPSTART_APP_LAUNCH_LIBRARIES}94 ${UBUNTU_APP_LAUNCH_LIBRARIES}
95 ${GTEST_LIBS})95 ${GTEST_LIBS})
9696
97add_test (service-test service-test)97add_test (service-test service-test)
9898
=== modified file 'tests/app-id-test.cc'
--- tests/app-id-test.cc 2014-03-24 20:43:29 +0000
+++ tests/app-id-test.cc 2014-05-26 13:09:13 +0000
@@ -19,7 +19,7 @@
19#include <gio/gio.h>19#include <gio/gio.h>
20#include <gtest/gtest.h>20#include <gtest/gtest.h>
21#include "dispatcher.h"21#include "dispatcher.h"
22#include "upstart-app-launch-mock.h"22#include "ubuntu-app-launch-mock.h"
2323
24class AppIdTest : public ::testing::Test24class AppIdTest : public ::testing::Test
25{25{
@@ -55,7 +55,7 @@
5555
56 g_main_loop_unref(mainloop);56 g_main_loop_unref(mainloop);
5757
58 upstart_app_launch_mock_clear_last_app_id();58 ubuntu_app_launch_mock_clear_last_app_id();
5959
60 g_test_dbus_down(testbus);60 g_test_dbus_down(testbus);
61 g_object_unref(testbus);61 g_object_unref(testbus);
@@ -72,41 +72,41 @@
72{72{
73 /* Good sanity check */73 /* Good sanity check */
74 dispatch_url("appid://com.test.good/app1/1.2.3");74 dispatch_url("appid://com.test.good/app1/1.2.3");
75 ASSERT_STREQ("com.test.good_app1_1.2.3", upstart_app_launch_mock_get_last_app_id());75 ASSERT_STREQ("com.test.good_app1_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
76 upstart_app_launch_mock_clear_last_app_id();76 ubuntu_app_launch_mock_clear_last_app_id();
7777
78 /* No version at all */78 /* No version at all */
79 dispatch_url("appid://com.test.good/app1");79 dispatch_url("appid://com.test.good/app1");
80 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());80 ASSERT_TRUE(NULL == ubuntu_app_launch_mock_get_last_app_id());
81 upstart_app_launch_mock_clear_last_app_id();81 ubuntu_app_launch_mock_clear_last_app_id();
82}82}
8383
84TEST_F(AppIdTest, WildcardUrl)84TEST_F(AppIdTest, WildcardUrl)
85{85{
86 /* Version wildcard */86 /* Version wildcard */
87 dispatch_url("appid://com.test.good/app1/current-user-version");87 dispatch_url("appid://com.test.good/app1/current-user-version");
88 ASSERT_STREQ("com.test.good_app1_1.2.3", upstart_app_launch_mock_get_last_app_id());88 ASSERT_STREQ("com.test.good_app1_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
89 upstart_app_launch_mock_clear_last_app_id();89 ubuntu_app_launch_mock_clear_last_app_id();
9090
91 /* First app */91 /* First app */
92 dispatch_url("appid://com.test.good/first-listed-app/current-user-version");92 dispatch_url("appid://com.test.good/first-listed-app/current-user-version");
93 ASSERT_STREQ("com.test.good_app1_1.2.3", upstart_app_launch_mock_get_last_app_id());93 ASSERT_STREQ("com.test.good_app1_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
94 upstart_app_launch_mock_clear_last_app_id();94 ubuntu_app_launch_mock_clear_last_app_id();
9595
96 /* Last app */96 /* Last app */
97 dispatch_url("appid://com.test.good/last-listed-app/current-user-version");97 dispatch_url("appid://com.test.good/last-listed-app/current-user-version");
98 ASSERT_STREQ("com.test.good_app1_1.2.3", upstart_app_launch_mock_get_last_app_id());98 ASSERT_STREQ("com.test.good_app1_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
99 upstart_app_launch_mock_clear_last_app_id();99 ubuntu_app_launch_mock_clear_last_app_id();
100100
101 /* Only app */101 /* Only app */
102 dispatch_url("appid://com.test.good/only-listed-app/current-user-version");102 dispatch_url("appid://com.test.good/only-listed-app/current-user-version");
103 ASSERT_STREQ("com.test.good_app1_1.2.3", upstart_app_launch_mock_get_last_app_id());103 ASSERT_STREQ("com.test.good_app1_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
104 upstart_app_launch_mock_clear_last_app_id();104 ubuntu_app_launch_mock_clear_last_app_id();
105105
106 /* Wild app fixed version */106 /* Wild app fixed version */
107 dispatch_url("appid://com.test.good/only-listed-app/1.2.3");107 dispatch_url("appid://com.test.good/only-listed-app/1.2.3");
108 ASSERT_STREQ("com.test.good_app1_1.2.3", upstart_app_launch_mock_get_last_app_id());108 ASSERT_STREQ("com.test.good_app1_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
109 upstart_app_launch_mock_clear_last_app_id();109 ubuntu_app_launch_mock_clear_last_app_id();
110110
111 return;111 return;
112}112}
@@ -114,16 +114,16 @@
114TEST_F(AppIdTest, OrderingUrl)114TEST_F(AppIdTest, OrderingUrl)
115{115{
116 dispatch_url("appid://com.test.multiple/first-listed-app/current-user-version");116 dispatch_url("appid://com.test.multiple/first-listed-app/current-user-version");
117 ASSERT_STREQ("com.test.multiple_app-first_1.2.3", upstart_app_launch_mock_get_last_app_id());117 ASSERT_STREQ("com.test.multiple_app-first_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
118 upstart_app_launch_mock_clear_last_app_id();118 ubuntu_app_launch_mock_clear_last_app_id();
119119
120 dispatch_url("appid://com.test.multiple/last-listed-app/current-user-version");120 dispatch_url("appid://com.test.multiple/last-listed-app/current-user-version");
121 ASSERT_STREQ("com.test.multiple_app-last_1.2.3", upstart_app_launch_mock_get_last_app_id());121 ASSERT_STREQ("com.test.multiple_app-last_1.2.3", ubuntu_app_launch_mock_get_last_app_id());
122 upstart_app_launch_mock_clear_last_app_id();122 ubuntu_app_launch_mock_clear_last_app_id();
123123
124 dispatch_url("appid://com.test.multiple/only-listed-app/current-user-version");124 dispatch_url("appid://com.test.multiple/only-listed-app/current-user-version");
125 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());125 ASSERT_TRUE(NULL == ubuntu_app_launch_mock_get_last_app_id());
126 upstart_app_launch_mock_clear_last_app_id();126 ubuntu_app_launch_mock_clear_last_app_id();
127127
128 return;128 return;
129}129}
@@ -133,8 +133,8 @@
133 g_setenv("TEST_CLICK_DB", "not-click-db", TRUE);133 g_setenv("TEST_CLICK_DB", "not-click-db", TRUE);
134134
135 dispatch_url("appid://com.test.good/app1/current-user-version");135 dispatch_url("appid://com.test.good/app1/current-user-version");
136 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());136 ASSERT_TRUE(NULL == ubuntu_app_launch_mock_get_last_app_id());
137 upstart_app_launch_mock_clear_last_app_id();137 ubuntu_app_launch_mock_clear_last_app_id();
138138
139 return;139 return;
140}140}
@@ -144,6 +144,6 @@
144 g_setenv("TEST_CLICK_USER", "not-test-user", TRUE);144 g_setenv("TEST_CLICK_USER", "not-test-user", TRUE);
145145
146 dispatch_url("appid://com.test.good/app1/current-user-version");146 dispatch_url("appid://com.test.good/app1/current-user-version");
147 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());147 ASSERT_TRUE(NULL == ubuntu_app_launch_mock_get_last_app_id());
148 upstart_app_launch_mock_clear_last_app_id();148 ubuntu_app_launch_mock_clear_last_app_id();
149}149}
150150
=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc 2014-03-31 17:17:07 +0000
+++ tests/dispatcher-test.cc 2014-05-26 13:09:13 +0000
@@ -19,7 +19,7 @@
19#include <gio/gio.h>19#include <gio/gio.h>
20#include <gtest/gtest.h>20#include <gtest/gtest.h>
21#include "dispatcher.h"21#include "dispatcher.h"
22#include "upstart-app-launch-mock.h"22#include "ubuntu-app-launch-mock.h"
23#include "url-db.h"23#include "url-db.h"
2424
25class DispatcherTest : public ::testing::Test25class DispatcherTest : public ::testing::Test
@@ -64,7 +64,7 @@
6464
65 g_main_loop_unref(mainloop);65 g_main_loop_unref(mainloop);
6666
67 upstart_app_launch_mock_clear_last_app_id();67 ubuntu_app_launch_mock_clear_last_app_id();
6868
69 /* let other threads settle */69 /* let other threads settle */
70 g_usleep(500000);70 g_usleep(500000);
@@ -84,28 +84,28 @@
84{84{
85 /* Good sanity check */85 /* Good sanity check */
86 dispatch_url("application:///foo.desktop");86 dispatch_url("application:///foo.desktop");
87 ASSERT_STREQ("foo", upstart_app_launch_mock_get_last_app_id());87 ASSERT_STREQ("foo", ubuntu_app_launch_mock_get_last_app_id());
88 upstart_app_launch_mock_clear_last_app_id();88 ubuntu_app_launch_mock_clear_last_app_id();
8989
90 /* No .desktop */90 /* No .desktop */
91 dispatch_url("application:///foo");91 dispatch_url("application:///foo");
92 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());92 ASSERT_TRUE(NULL == ubuntu_app_launch_mock_get_last_app_id());
93 upstart_app_launch_mock_clear_last_app_id();93 ubuntu_app_launch_mock_clear_last_app_id();
9494
95 /* Missing a / */95 /* Missing a / */
96 dispatch_url("application://foo.desktop");96 dispatch_url("application://foo.desktop");
97 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());97 ASSERT_TRUE(NULL == ubuntu_app_launch_mock_get_last_app_id());
98 upstart_app_launch_mock_clear_last_app_id();98 ubuntu_app_launch_mock_clear_last_app_id();
9999
100 /* Good with hyphens */100 /* Good with hyphens */
101 dispatch_url("application:///my-really-cool-app.desktop");101 dispatch_url("application:///my-really-cool-app.desktop");
102 ASSERT_STREQ("my-really-cool-app", upstart_app_launch_mock_get_last_app_id());102 ASSERT_STREQ("my-really-cool-app", ubuntu_app_launch_mock_get_last_app_id());
103 upstart_app_launch_mock_clear_last_app_id();103 ubuntu_app_launch_mock_clear_last_app_id();
104104
105 /* Good Click Style */105 /* Good Click Style */
106 dispatch_url("application:///com.test.foo_bar-app_0.3.4.desktop");106 dispatch_url("application:///com.test.foo_bar-app_0.3.4.desktop");
107 ASSERT_STREQ("com.test.foo_bar-app_0.3.4", upstart_app_launch_mock_get_last_app_id());107 ASSERT_STREQ("com.test.foo_bar-app_0.3.4", ubuntu_app_launch_mock_get_last_app_id());
108 upstart_app_launch_mock_clear_last_app_id();108 ubuntu_app_launch_mock_clear_last_app_id();
109109
110 return;110 return;
111}111}
@@ -114,13 +114,13 @@
114{114{
115 /* Base Calendar */115 /* Base Calendar */
116 dispatch_url("calendar:///?starttime=196311221830Z");116 dispatch_url("calendar:///?starttime=196311221830Z");
117 ASSERT_STREQ("com.ubuntu.calendar_calendar_9.8.2343", upstart_app_launch_mock_get_last_app_id());117 ASSERT_STREQ("com.ubuntu.calendar_calendar_9.8.2343", ubuntu_app_launch_mock_get_last_app_id());
118 upstart_app_launch_mock_clear_last_app_id();118 ubuntu_app_launch_mock_clear_last_app_id();
119119
120 /* Two Slash, nothing else */120 /* Two Slash, nothing else */
121 dispatch_url("calendar://");121 dispatch_url("calendar://");
122 ASSERT_STREQ("com.ubuntu.calendar_calendar_9.8.2343", upstart_app_launch_mock_get_last_app_id());122 ASSERT_STREQ("com.ubuntu.calendar_calendar_9.8.2343", ubuntu_app_launch_mock_get_last_app_id());
123 upstart_app_launch_mock_clear_last_app_id();123 ubuntu_app_launch_mock_clear_last_app_id();
124124
125 return;125 return;
126}126}
@@ -130,13 +130,13 @@
130{130{
131 /* File Video */131 /* File Video */
132 dispatch_url("file:///home/bar/Videos/foo.mp4");132 dispatch_url("file:///home/bar/Videos/foo.mp4");
133 ASSERT_STREQ("mediaplayer-app", upstart_app_launch_mock_get_last_app_id());133 ASSERT_STREQ("mediaplayer-app", ubuntu_app_launch_mock_get_last_app_id());
134 upstart_app_launch_mock_clear_last_app_id();134 ubuntu_app_launch_mock_clear_last_app_id();
135135
136 /* File Video */136 /* File Video */
137 dispatch_url("file:///home/bar/Music/The_Bars_Live.mp3");137 dispatch_url("file:///home/bar/Music/The_Bars_Live.mp3");
138 ASSERT_STREQ("com.ubuntu.music_music_1.5.4", upstart_app_launch_mock_get_last_app_id());138 ASSERT_STREQ("com.ubuntu.music_music_1.5.4", ubuntu_app_launch_mock_get_last_app_id());
139 upstart_app_launch_mock_clear_last_app_id();139 ubuntu_app_launch_mock_clear_last_app_id();
140140
141 return;141 return;
142}142}
143143
=== modified file 'tests/service-test.cc'
--- tests/service-test.cc 2014-02-13 17:01:05 +0000
+++ tests/service-test.cc 2014-05-26 13:09:13 +0000
@@ -32,7 +32,7 @@
32 GDBusConnection * bus = NULL;32 GDBusConnection * bus = NULL;
3333
34 virtual void SetUp() {34 virtual void SetUp() {
35 g_setenv("UPSTART_APP_LAUNCH_USE_SESSION", "1", TRUE);35 g_setenv("UBUNTU_APP_LAUNCH_USE_SESSION", "1", TRUE);
36 g_setenv("URL_DISPATCHER_DISABLE_RECOVERABLE_ERROR", "1", TRUE);36 g_setenv("URL_DISPATCHER_DISABLE_RECOVERABLE_ERROR", "1", TRUE);
3737
38 service = dbus_test_service_new(NULL);38 service = dbus_test_service_new(NULL);
3939
=== renamed file 'tests/upstart-app-launch-mock.c' => 'tests/ubuntu-app-launch-mock.c'
--- tests/upstart-app-launch-mock.c 2013-09-26 16:04:51 +0000
+++ tests/ubuntu-app-launch-mock.c 2014-05-26 13:09:13 +0000
@@ -15,21 +15,21 @@
15 *15 *
16 */16 */
1717
18#include <upstart-app-launch.h>18#include <ubuntu-app-launch.h>
19#include "upstart-app-launch-mock.h"19#include "ubuntu-app-launch-mock.h"
2020
21static gchar * last_appid = NULL;21static gchar * last_appid = NULL;
2222
23gboolean23gboolean
24upstart_app_launch_start_application (const gchar * appid, const gchar * const * uris)24ubuntu_app_launch_start_application (const gchar * appid, const gchar * const * uris)
25{25{
26 upstart_app_launch_mock_clear_last_app_id();26 ubuntu_app_launch_mock_clear_last_app_id();
27 last_appid = g_strdup(appid);27 last_appid = g_strdup(appid);
28 return TRUE;28 return TRUE;
29}29}
3030
31void31void
32upstart_app_launch_mock_clear_last_app_id (void)32ubuntu_app_launch_mock_clear_last_app_id (void)
33{33{
34 g_free(last_appid);34 g_free(last_appid);
35 last_appid = NULL;35 last_appid = NULL;
@@ -37,7 +37,7 @@
37}37}
3838
39gchar *39gchar *
40upstart_app_launch_mock_get_last_app_id (void)40ubuntu_app_launch_mock_get_last_app_id (void)
41{41{
42 return last_appid;42 return last_appid;
43}43}
4444
=== renamed file 'tests/upstart-app-launch-mock.h' => 'tests/ubuntu-app-launch-mock.h'
--- tests/upstart-app-launch-mock.h 2013-09-26 16:01:14 +0000
+++ tests/ubuntu-app-launch-mock.h 2014-05-26 13:09:13 +0000
@@ -22,8 +22,8 @@
2222
23G_BEGIN_DECLS23G_BEGIN_DECLS
2424
25void upstart_app_launch_mock_clear_last_app_id (void);25void ubuntu_app_launch_mock_clear_last_app_id (void);
26gchar * upstart_app_launch_mock_get_last_app_id (void);26gchar * ubuntu_app_launch_mock_get_last_app_id (void);
2727
28G_END_DECLS28G_END_DECLS
2929

Subscribers

People subscribed via source and target branches