Merge lp:~ted/url-dispatcher/calendar-url into lp:url-dispatcher/13.10

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 32
Merged at revision: 31
Proposed branch: lp:~ted/url-dispatcher/calendar-url
Merge into: lp:url-dispatcher/13.10
Prerequisite: lp:~ted/url-dispatcher/testability
Diff against target: 39 lines (+21/-0)
2 files modified
service/dispatcher.c (+6/-0)
tests/dispatcher-test.cc (+15/-0)
To merge this branch: bzr merge lp:~ted/url-dispatcher/calendar-url
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+188146@code.launchpad.net

This proposal supersedes a proposal from 2013-09-26.

Commit message

Adding a calendar URL

Description of the change

Adding a calendar URL

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

It's a baby step forward, but looks good. :)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'service/dispatcher.c'
--- service/dispatcher.c 2013-09-27 19:21:52 +0000
+++ service/dispatcher.c 2013-09-27 19:21:52 +0000
@@ -143,6 +143,12 @@
143 .regex_object = NULL,143 .regex_object = NULL,
144 .app_id = "address-book-app"144 .app_id = "address-book-app"
145 },145 },
146 /* Calendar */
147 {
148 .regex_patern = "^calendar:///",
149 .regex_object = NULL,
150 .app_id = "calendar-app"
151 },
146 /* Messages */152 /* Messages */
147 {153 {
148 .regex_patern = "^message://",154 .regex_patern = "^message://",
149155
=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc 2013-09-27 19:21:52 +0000
+++ tests/dispatcher-test.cc 2013-09-27 19:21:52 +0000
@@ -85,3 +85,18 @@
8585
86 return;86 return;
87}87}
88
89TEST_F(DispatcherTest, CalendarTest)
90{
91 /* Base Calendar */
92 dispatch_url("calendar:///?starttime=196311221830Z");
93 ASSERT_STREQ("calendar-app", upstart_app_launch_mock_get_last_app_id());
94 upstart_app_launch_mock_clear_last_app_id();
95
96 /* Two Slash Calendar */
97 dispatch_url("calendar://?starttime=196311221830Z");
98 ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());
99 upstart_app_launch_mock_clear_last_app_id();
100
101 return;
102}

Subscribers

People subscribed via source and target branches