URL Dispatcher

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

  1. calendar-url
  2. Merge into trunk.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

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/18

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/20

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

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

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/26

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

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
1=== modified file 'service/dispatcher.c'
2--- service/dispatcher.c 2013-09-27 19:21:52 +0000
3+++ service/dispatcher.c 2013-09-27 19:21:52 +0000
4@@ -143,6 +143,12 @@
5 .regex_object = NULL,
6 .app_id = "address-book-app"
7 },
8+ /* Calendar */
9+ {
10+ .regex_patern = "^calendar:///",
11+ .regex_object = NULL,
12+ .app_id = "calendar-app"
13+ },
14 /* Messages */
15 {
16 .regex_patern = "^message://",
17
18=== modified file 'tests/dispatcher-test.cc'
19--- tests/dispatcher-test.cc 2013-09-27 19:21:52 +0000
20+++ tests/dispatcher-test.cc 2013-09-27 19:21:52 +0000
21@@ -85,3 +85,18 @@
22
23 return;
24 }
25+
26+TEST_F(DispatcherTest, CalendarTest)
27+{
28+ /* Base Calendar */
29+ dispatch_url("calendar:///?starttime=196311221830Z");
30+ ASSERT_STREQ("calendar-app", upstart_app_launch_mock_get_last_app_id());
31+ upstart_app_launch_mock_clear_last_app_id();
32+
33+ /* Two Slash Calendar */
34+ dispatch_url("calendar://?starttime=196311221830Z");
35+ ASSERT_TRUE(NULL == upstart_app_launch_mock_get_last_app_id());
36+ upstart_app_launch_mock_clear_last_app_id();
37+
38+ return;
39+}

Subscribers

People subscribed via source and target branches