1
=== modified file 'tests/test-eds-ics-all-day-events.cpp'
2
--- tests/test-eds-ics-all-day-events.cpp	2016-05-14 02:07:10 +0000
3
+++ tests/test-eds-ics-all-day-events.cpp	2017-08-29 15:19:46 +0000
4
@@ -52,7 +52,7 @@
5
52
    // make a planner that looks at the first half of 2015 in EDS
52
    // make a planner that looks at the first half of 2015 in EDS
6
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
7
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
9
55
    const DateTime range_end   {gtz, 2015,6,31,23,59,59.5};
55
    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
10
56
    planner->range().set(std::make_pair(range_begin, range_end));
56
    planner->range().set(std::make_pair(range_begin, range_end));
11
57
57
12
58
    // give EDS a moment to load
58
    // give EDS a moment to load
13
59
59
14
=== modified file 'tests/test-eds-ics-missing-trigger.cpp'
15
--- tests/test-eds-ics-missing-trigger.cpp	2016-05-14 02:07:10 +0000
16
+++ tests/test-eds-ics-missing-trigger.cpp	2017-08-29 15:19:46 +0000
17
@@ -52,7 +52,7 @@
18
52
    // make a planner that looks at the first half of 2015 in EDS
52
    // make a planner that looks at the first half of 2015 in EDS
19
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
20
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
22
55
    const DateTime range_end   {gtz, 2015,6,31,23,59,59.5};
55
    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
23
56
    planner->range().set(std::make_pair(range_begin, range_end));
56
    planner->range().set(std::make_pair(range_begin, range_end));
24
57
57
25
58
    // give EDS a moment to load
58
    // give EDS a moment to load
26
@@ -87,7 +87,7 @@
27
87
    a.uid = "20150617T211913Z-6217-32011-2036-5@ubuntu-phablet";
87
    a.uid = "20150617T211913Z-6217-32011-2036-5@ubuntu-phablet";
28
88
    a.summary = "Recurring Alarm";
88
    a.summary = "Recurring Alarm";
29
89
    a.alarms[0].text = a.summary;
89
    a.alarms[0].text = a.summary;
31
90
    std::array<DateTime,14> recurrences {
90
    std::array<DateTime,13> recurrences {
32
91
        DateTime{ gtz, 2015, 6, 18, 10, 1, 0 },
91
        DateTime{ gtz, 2015, 6, 18, 10, 1, 0 },
33
92
        DateTime{ gtz, 2015, 6, 19, 10, 1, 0 },
92
        DateTime{ gtz, 2015, 6, 19, 10, 1, 0 },
34
93
        DateTime{ gtz, 2015, 6, 20, 10, 1, 0 },
93
        DateTime{ gtz, 2015, 6, 20, 10, 1, 0 },
35
@@ -101,7 +101,6 @@
36
101
        DateTime{ gtz, 2015, 6, 28, 10, 1, 0 },
101
        DateTime{ gtz, 2015, 6, 28, 10, 1, 0 },
37
102
        DateTime{ gtz, 2015, 6, 29, 10, 1, 0 },
102
        DateTime{ gtz, 2015, 6, 29, 10, 1, 0 },
38
103
        DateTime{ gtz, 2015, 6, 30, 10, 1, 0 },
103
        DateTime{ gtz, 2015, 6, 30, 10, 1, 0 },
39
104
        DateTime{ gtz, 2015, 7,  1, 10, 1, 0 }
40
105
    };
104
    };
41
106
    for (const auto& time : recurrences) {
105
    for (const auto& time : recurrences) {
42
107
        a.begin = a.end = a.alarms[0].time = time;
106
        a.begin = a.end = a.alarms[0].time = time;
43
108
107
44
=== modified file 'tests/test-eds-ics-non-attending-alarms.cpp'
45
--- tests/test-eds-ics-non-attending-alarms.cpp	2016-05-14 02:16:53 +0000
46
+++ tests/test-eds-ics-non-attending-alarms.cpp	2017-08-29 15:19:46 +0000
47
@@ -52,7 +52,7 @@
48
52
    // make a planner that looks at the first half of 2016 in EDS
52
    // make a planner that looks at the first half of 2016 in EDS
49
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
50
54
    const DateTime range_begin {gtz, 2016,1, 1, 0, 0, 0.0};
54
    const DateTime range_begin {gtz, 2016,1, 1, 0, 0, 0.0};
52
55
    const DateTime range_end   {gtz, 2016,6,31,23,59,59.5};
55
    const DateTime range_end   {gtz, 2016,6,30,23,59,59.5};
53
56
    planner->range().set(std::make_pair(range_begin, range_end));
56
    planner->range().set(std::make_pair(range_begin, range_end));
54
57
57
55
58
    // give EDS a moment to load
58
    // give EDS a moment to load
56
59
59
57
=== modified file 'tests/test-eds-ics-non-selected-source.cpp'
58
--- tests/test-eds-ics-non-selected-source.cpp	2016-06-21 21:39:39 +0000
59
+++ tests/test-eds-ics-non-selected-source.cpp	2017-08-29 15:19:46 +0000
60
@@ -50,7 +50,7 @@
61
50
    // make a planner that looks at the first half of 2015 in EDS
50
    // make a planner that looks at the first half of 2015 in EDS
62
51
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
51
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
63
52
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
52
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
65
53
    const DateTime range_end   {gtz, 2015,6,31,23,59,59.5};
53
    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
66
54
    planner->range().set(std::make_pair(range_begin, range_end));
54
    planner->range().set(std::make_pair(range_begin, range_end));
67
55
55
68
56
    // give EDS a moment to load
56
    // give EDS a moment to load
69
57
57
70
=== modified file 'tests/test-eds-ics-nonrepeating-events.cpp'
71
--- tests/test-eds-ics-nonrepeating-events.cpp	2016-05-14 02:07:10 +0000
72
+++ tests/test-eds-ics-nonrepeating-events.cpp	2017-08-29 15:19:46 +0000
73
@@ -52,7 +52,7 @@
74
52
    // make a planner that looks at the first half of 2015 in EDS
52
    // make a planner that looks at the first half of 2015 in EDS
75
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
76
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
78
55
    const DateTime range_end   {gtz, 2015,6,31,23,59,59.5};
55
    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
79
56
    planner->range().set(std::make_pair(range_begin, range_end));
56
    planner->range().set(std::make_pair(range_begin, range_end));
80
57
57
81
58
    // give EDS a moment to load
58
    // give EDS a moment to load
82
59
59
83
=== modified file 'tests/test-eds-ics-repeating-events.cpp'
84
--- tests/test-eds-ics-repeating-events.cpp	2016-05-14 02:07:10 +0000
85
+++ tests/test-eds-ics-repeating-events.cpp	2017-08-29 15:19:46 +0000
86
@@ -52,7 +52,7 @@
87
52
    // make a planner that looks at the first half of 2015 in EDS
52
    // make a planner that looks at the first half of 2015 in EDS
88
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
89
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
91
55
    const DateTime range_end   {gtz, 2015,6,31,23,59,59.5};
55
    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
92
56
    planner->range().set(std::make_pair(range_begin, range_end));
56
    planner->range().set(std::make_pair(range_begin, range_end));
93
57
57
94
58
    // give EDS a moment to load
58
    // give EDS a moment to load
95
59
59
96
=== modified file 'tests/test-eds-ics-repeating-valarms.cpp'
97
--- tests/test-eds-ics-repeating-valarms.cpp	2016-05-14 02:07:10 +0000
98
+++ tests/test-eds-ics-repeating-valarms.cpp	2017-08-29 15:19:46 +0000
99
@@ -52,7 +52,7 @@
100
52
    // make a planner that looks at the first half of 2015 in EDS
52
    // make a planner that looks at the first half of 2015 in EDS
101
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
53
    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
102
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
54
    const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
104
55
    const DateTime range_end   {gtz, 2015,6,31,23,59,59.5};
55
    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
105
56
    planner->range().set(std::make_pair(range_begin, range_end));
56
    planner->range().set(std::make_pair(range_begin, range_end));
106
57
57
107
58
    // give EDS a moment to load
58
    // give EDS a moment to load
Status:	Merged
Approved by:	Marco Trevisan (Treviño) on 2017-08-30
Approved revision:	490
Merged at revision:	489
Proposed branch:	lp:~azzar1/indicator-datetime/31-june-its-not-a-thing
Merge into:	lp:indicator-datetime
Prerequisite:	lp:~3v1n0/indicator-datetime/calendar-data-files
Diff against target:	107 lines (+8/-9) 7 files modified tests/test-eds-ics-all-day-events.cpp (+1/-1) tests/test-eds-ics-missing-trigger.cpp (+2/-3) tests/test-eds-ics-non-attending-alarms.cpp (+1/-1) tests/test-eds-ics-non-selected-source.cpp (+1/-1) tests/test-eds-ics-nonrepeating-events.cpp (+1/-1) tests/test-eds-ics-repeating-events.cpp (+1/-1) tests/test-eds-ics-repeating-valarms.cpp (+1/-1)
To merge this branch:	bzr merge lp:~azzar1/indicator-datetime/31-june-its-not-a-thing
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Marco Trevisan (Treviño)		2017-08-29	Approve on 2017-08-30
unity-api-1-bot	continuous-integration		Approve on 2017-08-29
Review via email: mp+329819@code.launchpad.net