1
=== removed file 'Components/Time.js'
2
--- Components/Time.js	2013-11-04 15:35:18 +0000
3
+++ Components/Time.js	1970-01-01 00:00:00 +0000
4
@@ -1,49 +0,0 @@
5
1
/*
6
2
 * Copyright (C) 2013 Canonical, Ltd.
7
3
 *
8
4
 * This program is free software; you can redistribute it and/or modify
9
5
 * it under the terms of the GNU General Public License as published by
10
6
 * the Free Software Foundation; version 3.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 */
20
16
21
17
.pragma library
22
18
23
19
var factors = [
24
20
    [ 1000, "a second ago", "in a second", "%1 seconds ago", "in %1 seconds" ],
25
21
    [ 60, "a minute ago", "in a minute", "%1 minutes ago", "in %1 minutes" ],
26
22
    [ 60, "an hour ago", "in an hour", "%1 hours ago", "in %1 hours" ],
27
23
    [ 24, "yesterday", "tomorrow", "%1 days ago", "in %1 days" ],
28
24
    [ 7, "a week ago", "in a week", "about %1 weeks ago", "in about %1 weeks" ],
29
25
    [ 4.35, "a month ago", "in a month", "%1 months ago", "in %1 months" ], // == 365.25 days / 12 months / 7 days
30
26
    [ 12, "a year ago", "in a year", "%1 years ago", "in %1 years" ]
31
27
]
32
28
33
29
function readableFromNow(date, now) {
34
30
    var then = new Date(date);
35
31
    if (isNaN(then)) return "";
36
32
    if (now === undefined) {
37
33
        now = new Date();
38
34
    } else if (isNaN(now)) throw "now is NaN";
39
35
    var diff = Math.abs(now - then);
40
36
    if (diff < 1000) return "just now";
41
37
42
38
    var future = now < then;
43
39
    var humanDiff;
44
40
    for (var k in factors) {
45
41
        diff /= factors[k][0];
46
42
        if (Math.floor(diff) == 1) {
47
43
            humanDiff = factors[k][future ? 2 : 1];
48
44
        } else if (Math.floor(diff) > 1) {
49
45
            humanDiff = factors[k][future ? 4 : 3].arg(Math.round(diff));
50
46
        } else break;
51
47
    }
52
48
    return humanDiff;
53
49
}
54
50
0
55
=== modified file 'tests/qmltests/CMakeLists.txt'
56
--- tests/qmltests/CMakeLists.txt	2013-11-11 09:01:28 +0000
57
+++ tests/qmltests/CMakeLists.txt	2013-11-19 09:55:06 +0000
58
@@ -15,7 +15,6 @@
59
15
add_qml_test(Components Carousel)
15
add_qml_test(Components Carousel)
60
16
add_qml_test(Components OpenEffect)
16
add_qml_test(Components OpenEffect)
61
17
add_qml_test(Components RatingStars)
17
add_qml_test(Components RatingStars)
62
18
add_qml_test(Components TimeLocal)
63
19
add_qml_test(Panel IndicatorItem)
18
add_qml_test(Panel IndicatorItem)
64
20
add_qml_test(utils/Unity/Test UnityTest)
19
add_qml_test(utils/Unity/Test UnityTest)
65
21
20
66
22
21
67
=== removed file 'tests/qmltests/Components/tst_TimeLocal.qml'
68
--- tests/qmltests/Components/tst_TimeLocal.qml	2013-06-05 22:03:08 +0000
69
+++ tests/qmltests/Components/tst_TimeLocal.qml	1970-01-01 00:00:00 +0000
70
@@ -1,117 +0,0 @@
71
1
/*
72
2
 * Copyright 2013 Canonical Ltd.
73
3
 *
74
4
 * This program is free software; you can redistribute it and/or modify
75
5
 * it under the terms of the GNU General Public License as published by
76
6
 * the Free Software Foundation; version 3.
77
7
 *
78
8
 * This program is distributed in the hope that it will be useful,
79
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
80
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81
11
 * GNU General Public License for more details.
82
12
 *
83
13
 * You should have received a copy of the GNU General Public License
84
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
85
15
 */
86
16
87
17
import QtQuick 2.0
88
18
import QtTest 1.0
89
19
import "../../../Components/Time.js" as TimeLocal
90
20
91
21
TestCase {
92
22
    name: "TimeLocal"
93
23
94
24
    property var readableDate
95
25
96
26
    function test_readableFromNow_dateUndefined() {
97
27
        readableDate = TimeLocal.readableFromNow()
98
28
        compare(readableDate, "", "readable date should have been null")
99
29
    }
100
30
101
31
    function test_readableFromNow_dateNaN() {
102
32
        readableDate = TimeLocal.readableFromNow("this is a string, not a date")
103
33
        compare(readableDate, "", "readable date should have been null")
104
34
    }
105
35
106
36
    function test_readableFromNow_justNow() {
107
37
        readableDate = TimeLocal.readableFromNow(new Date())
108
38
        compare(readableDate, "just now", "readable date should have been now")
109
39
    }
110
40
111
41
    function test_readableFromNow_nowNaN() {
112
42
        var fail = false
113
43
        try {
114
44
            TimeLocal.readableFromNow(new Date(), "this is a string, not a date")
115
45
        } catch (err) {
116
46
            fail = true
117
47
        } finally {
118
48
            compare(fail, true, "readable date should have thrown an exception")
119
49
        }
120
50
    }
121
51
122
52
    function cycleTime(diff, previous, next, units, endIterator) {
123
53
        var now = new Date()
124
54
        var time = now.getTime()
125
55
        readableDate = TimeLocal.readableFromNow(time - diff, now)
126
56
        compare(readableDate, previous, "different time predicted")
127
57
        readableDate = TimeLocal.readableFromNow(time + diff, now)
128
58
        compare(readableDate, next, "different time predicted")
129
59
        for (var i = 2; i < endIterator; i++) {
130
60
            var tmpDiff = i * diff
131
61
            readableDate = TimeLocal.readableFromNow(time - tmpDiff, now)
132
62
            compare(readableDate, i + " " + units + " ago", "different time predicted")
133
63
            readableDate = TimeLocal.readableFromNow(time + tmpDiff, now)
134
64
            compare(readableDate, "in " + i + " " + units, "different time predicted")
135
65
        }
136
66
    }
137
67
138
68
    function test_readableFromNow_seconds() {
139
69
        cycleTime(1000, "a second ago", "in a second", "seconds", 60)
140
70
    }
141
71
142
72
    function test_readableFromNow_minutes() {
143
73
        cycleTime(1000 * 60, "a minute ago", "in a minute", "minutes", 60)
144
74
    }
145
75
146
76
    function test_readableFromNow_hours() {
147
77
        cycleTime(1000 * 60 * 60, "an hour ago", "in an hour", "hours", 24)
148
78
    }
149
79
150
80
    function test_readableFromNow_days() {
151
81
        cycleTime(1000 * 60 * 60 * 24, "yesterday", "tomorrow", "days", 7)
152
82
    }
153
83
154
84
    function test_readableFromNow_weeks() {
155
85
        var now = new Date()
156
86
        for (var i = 7; i < 30; i++) {
157
87
            readableDate = TimeLocal.readableFromNow(now.getTime() - i * 1000 * 60 * 60 * 24, now)
158
88
            if (i < 14)
159
89
                compare(readableDate, "a week ago", "different time predicted")
160
90
            else if (i < 18)
161
91
                compare(readableDate, "about 2 weeks ago", "different time predicted")
162
92
            else if (i < 25)
163
93
                compare(readableDate, "about 3 weeks ago", "different time predicted")
164
94
            else
165
95
                compare(readableDate, "about 4 weeks ago", "different time predicted")
166
96
        }
167
97
        for (var i = 7; i < 30; i++) {
168
98
            readableDate = TimeLocal.readableFromNow(now.getTime() + i * 1000 * 60 * 60 * 24, now)
169
99
            if (i < 14)
170
100
                compare(readableDate, "in a week", "different time predicted")
171
101
            else if (i < 18)
172
102
                compare(readableDate, "in about 2 weeks", "different time predicted")
173
103
            else if (i < 25)
174
104
                compare(readableDate, "in about 3 weeks", "different time predicted")
175
105
            else
176
106
                compare(readableDate, "in about 4 weeks", "different time predicted")
177
107
        }
178
108
    }
179
109
180
110
    function test_readableFromNow_months() {
181
111
        cycleTime(1000 * 60 * 60 * 24 * 30.45, "a month ago", "in a month", "months", 12)
182
112
    }
183
113
184
114
    function test_readableFromNow_years() {
185
115
        cycleTime(1000 * 60 * 60 * 24 * 366, "a year ago", "in a year", "years", 5)
186
116
    }
187
117
}
Status:	Merged
Approved by:	Michał Sawicz on 2013-11-19
Approved revision:	535
Merged at revision:	539
Proposed branch:	lp:~aacid/unity8/notime.js
Merge into:	lp:unity8
Diff against target:	187 lines (+0/-167) 3 files modified Components/Time.js (+0/-49) tests/qmltests/CMakeLists.txt (+0/-1) tests/qmltests/Components/tst_TimeLocal.qml (+0/-117)
To merge this branch:	bzr merge lp:~aacid/unity8/notime.js
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-20
Michał Sawicz		2013-11-19	Approve on 2013-11-19
Review via email: mp+195733@code.launchpad.net