Skip to content

Commit 0d9cdf6

Browse files
lunnylunny
committed
Fix tests
1 parent e19c1a9 commit 0d9cdf6

File tree

2 files changed

+81
-21
lines changed

2 files changed

+81
-21
lines changed

‎modules/timeutil/since.go

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,72 @@ const (
2222
Hour = 60 * Minute
2323
Day = 24 * Hour
2424
Week = 7 * Day
25-
Year = 365*Day + 5*Hour + 48*Minute + 46 // 365d5h48m46s ref. https://pumas.nasa.gov/files/04_21_97_1.pdf
26-
Month = Year / 12
25+
Month = 30 * Day
26+
Year = 12 * Month
2727
)
2828

2929
func round(s float64) int64 {
3030
return int64(math.Round(s))
3131
}
3232

33+
func computeTimeDiffFloor(diff int64, lang string) (int64, string) {
34+
diffStr := ""
35+
switch {
36+
case diff <= 0:
37+
diff = 0
38+
diffStr = i18n.Tr(lang, "tool.now")
39+
case diff < 2:
40+
diff = 0
41+
diffStr = i18n.Tr(lang, "tool.1s")
42+
case diff < 1*Minute:
43+
diffStr = i18n.Tr(lang, "tool.seconds", diff)
44+
diff = 0
45+
46+
case diff < 2*Minute:
47+
diff -= 1 * Minute
48+
diffStr = i18n.Tr(lang, "tool.1m")
49+
case diff < 1*Hour:
50+
diffStr = i18n.Tr(lang, "tool.minutes", diff/Minute)
51+
diff -= diff / Minute * Minute
52+
53+
case diff < 2*Hour:
54+
diff -= 1 * Hour
55+
diffStr = i18n.Tr(lang, "tool.1h")
56+
case diff < 1*Day:
57+
diffStr = i18n.Tr(lang, "tool.hours", diff/Hour)
58+
diff -= diff / Hour * Hour
59+
60+
case diff < 2*Day:
61+
diff -= 1 * Day
62+
diffStr = i18n.Tr(lang, "tool.1d")
63+
case diff < 1*Week:
64+
diffStr = i18n.Tr(lang, "tool.days", diff/Day)
65+
diff -= diff / Day * Day
66+
67+
case diff < 2*Week:
68+
diff -= 1 * Week
69+
diffStr = i18n.Tr(lang, "tool.1w")
70+
case diff < 1*Month:
71+
diffStr = i18n.Tr(lang, "tool.weeks", diff/Week)
72+
diff -= diff / Week * Week
73+
74+
case diff < 2*Month:
75+
diff -= 1 * Month
76+
diffStr = i18n.Tr(lang, "tool.1mon")
77+
case diff < 1*Year:
78+
diffStr = i18n.Tr(lang, "tool.months", diff/Month)
79+
diff -= diff / Month * Month
80+
81+
case diff < 2*Year:
82+
diff -= 1 * Year
83+
diffStr = i18n.Tr(lang, "tool.1y")
84+
default:
85+
diffStr = i18n.Tr(lang, "tool.years", diff/Year)
86+
diff -= (diff / Year) * Year
87+
}
88+
return diff, diffStr
89+
}
90+
3391
func computeTimeDiff(diff int64, lang string) (int64, string) {
3492
diffStr := ""
3593
switch {
@@ -146,7 +204,7 @@ func timeSincePro(then, now time.Time, lang string) string {
146204
break
147205
}
148206

149-
diff, diffStr = computeTimeDiff(diff, lang)
207+
diff, diffStr = computeTimeDiffFloor(diff, lang)
150208
timeStr += ", " + diffStr
151209
}
152210
return strings.TrimPrefix(timeStr, ", ")

‎modules/timeutil/since_test.go

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,39 @@ func TestTimeSince(t *testing.T) {
4646

4747
// test that each diff in `diffs` yields the expected string
4848
test := func(expected string, diffs ...time.Duration) {
49-
for _, diff := range diffs {
50-
actual := timeSince(BaseDate, BaseDate.Add(diff), "en")
51-
assert.Equal(t, i18n.Tr("en", "tool.ago", expected), actual)
52-
actual = timeSince(BaseDate.Add(diff), BaseDate, "en")
53-
assert.Equal(t, i18n.Tr("en", "tool.from_now", expected), actual)
54-
}
49+
t.Run(expected, func(t *testing.T) {
50+
for _, diff := range diffs {
51+
actual := timeSince(BaseDate, BaseDate.Add(diff), "en")
52+
assert.Equal(t, i18n.Tr("en", "tool.ago", expected), actual)
53+
actual = timeSince(BaseDate.Add(diff), BaseDate, "en")
54+
assert.Equal(t, i18n.Tr("en", "tool.from_now", expected), actual)
55+
}
56+
})
5557
}
5658
test("1 second", time.Second, time.Second+50*time.Millisecond)
5759
test("2 seconds", 2*time.Second, 2*time.Second+50*time.Millisecond)
5860
test("1 minute", time.Minute, time.Minute+29*time.Second)
59-
test("2 minutes", time.Minute, time.Minute+30*time.Second)
61+
test("2 minutes", 2*time.Minute, time.Minute+30*time.Second)
6062
test("2 minutes", 2*time.Minute, 2*time.Minute+29*time.Second)
6163
test("1 hour", time.Hour, time.Hour+29*time.Minute)
62-
test("2 hours", time.Hour, time.Hour+30*time.Minute)
64+
test("2 hours", 2*time.Hour, time.Hour+30*time.Minute)
6365
test("2 hours", 2*time.Hour, 2*time.Hour+29*time.Minute)
64-
test("3 hours", 2*time.Hour, 2*time.Hour+30*time.Minute)
66+
test("3 hours", 3*time.Hour, 2*time.Hour+30*time.Minute)
6567
test("1 day", DayDur, DayDur+11*time.Hour)
66-
test("2 days", DayDur, DayDur+12*time.Hour)
68+
test("2 days", 2*DayDur, DayDur+12*time.Hour)
6769
test("2 days", 2*DayDur, 2*DayDur+11*time.Hour)
68-
test("3 days", 2*DayDur, 2*DayDur+12*time.Hour)
70+
test("3 days", 3*DayDur, 2*DayDur+12*time.Hour)
6971
test("1 week", WeekDur, WeekDur+3*DayDur)
70-
test("2 weeks", WeekDur, WeekDur+4*DayDur)
72+
test("2 weeks", 2*WeekDur, WeekDur+4*DayDur)
7173
test("2 weeks", 2*WeekDur, 2*WeekDur+3*DayDur)
72-
test("3 weeks", 2*WeekDur, 2*WeekDur+4*DayDur)
73-
test("1 month", MonthDur, MonthDur+15*DayDur)
74-
test("2 months", MonthDur, MonthDur+16*DayDur)
75-
test("2 months", 2*MonthDur, 2*MonthDur+15*DayDur)
74+
test("3 weeks", 3*WeekDur, 2*WeekDur+4*DayDur)
75+
test("1 month", MonthDur, MonthDur+14*DayDur)
76+
test("2 months", 2*MonthDur, MonthDur+15*DayDur)
77+
test("2 months", 2*MonthDur, 2*MonthDur+14*DayDur)
7678
test("1 year", YearDur, YearDur+5*MonthDur)
77-
test("2 years", YearDur, YearDur+6*MonthDur)
79+
test("2 years", 2*YearDur, YearDur+6*MonthDur)
7880
test("2 years", 2*YearDur, 2*YearDur+5*MonthDur)
79-
test("3 years", 2*YearDur, 2*YearDur+6*MonthDur)
81+
test("3 years", 3*YearDur, 2*YearDur+6*MonthDur)
8082
}
8183

8284
func TestTimeSincePro(t *testing.T) {

0 commit comments

Comments
 (0)