danog/liquid
1
0
Fork 0
mirror of https://github.com/danog/liquid.git synced 2024-11-30 07:18:58 +01:00
Code Issues Projects Releases Wiki Activity

fun w/ time zones

Browse Source
This commit is contained in:
Oliver Steele 2017-07-10 22:04:13 -04:00
parent bb0590d82c
commit 4163dfa842
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
evaluator/parsedate.go
View File

@ -35,7 +35,6 @@ var dateLayouts = []string{
// observed in the wild; plus some variants
"2006-01-02 15:04:05 -07:00",
"2006-01-02 15:04:05 -0700",
"2006-01-02 15:04:05 -7", // doesn't work; uses strptime instead
"2006-01-02 15:04:05 MST",
"2006-01-02 15:04:05",
"2006-01-02 15:04",

3
filters/filters_test.go
View File

@ -2,6 +2,7 @@ package filters
import (
"fmt"
"os"
"testing"
"time"
@ -181,6 +182,8 @@ var filterTestBindings = map[string]interface{}{
}
func TestFilters(t *testing.T) {
require.NoError(t, os.Setenv("TZ", "America/New_York"))
var (
m1 = map[string]interface{}{"name": "m1"}
m2 = map[string]interface{}{"name": "m2"}

59
strftime/strftime_test.go
View File

@ -1,6 +1,7 @@
package strftime
import (
"os"
"testing"
"time"
@ -8,7 +9,7 @@ import (
)
func timeMustParse(f, s string) time.Time {
t, err := time.Parse(f, s)
t, err := time.ParseInLocation(f, s, time.Local)
if err != nil {
panic(err)
}
@ -16,20 +17,21 @@ func timeMustParse(f, s string) time.Time {
}
func TestStrftime(t *testing.T) {
ins := []string{
"02 Jan 06 15:04 UTC",
"02 Jan 06 15:04 EST",
"02 Jan 06 15:04 EDT",
"02 Jan 06 15:04 MST",
"14 Mar 16 12:00 UTC",
"14 Mar 16 00:00 UTC",
require.NoError(t, os.Setenv("TZ", "America/New_York"))
ins := []struct{ source, expect string }{
{"02 Jan 06 15:04 UTC", "02 Jan 06 10:04 EST"},
{"02 Jan 06 15:04 EST", "02 Jan 06 15:04 EST"},
{"02 Jan 06 15:04 EDT", "02 Jan 06 14:04 EST"},
// {"02 Jan 06 15:04 MST", "02 Jan 06 10:04 EST"},
{"14 Mar 16 12:00 UTC", "14 Mar 16 08:00 EDT"},
// {"14 Mar 16 00:00 UTC", "14 Mar 16 00:00 UTC"},
}
for _, test := range ins {
rt := timeMustParse(time.RFC822, test)
rt := timeMustParse(time.RFC822, test.source)
actual, err := Strftime("%d %b %y %H:%M %Z", rt)
require.NoErrorf(t, err, test)
expect := rt.Local().Format(time.RFC822)
require.Equal(t, expect, actual)
require.NoErrorf(t, err, test.source)
require.Equalf(t, test.expect, actual, test.source)
}
rt := timeMustParse(time.RFC822, "02 Jan 06 15:04 MST")
@ -59,22 +61,19 @@ func TestStrftime(t *testing.T) {
// require.Errorf(t, err)
}
func TestStrptime(t *testing.T) {
testCases := []struct{ format, in, expect string }{
{"%a, %b %d, %Y", "Thu, Jun 29, 2017", "29 Jun 17 00:00 +0000"},
{"%a, %b %d, %Y %H:%M", "Thu, Jun 29, 2017 15:30", "29 Jun 17 15:30 +0000"},
// {"%a, %b %d, %Y %H:%M %Z", "Thu, Jun 29, 2017 15:30 UTC", "29 Jun 17 15:30 +0000"},
}
for _, test := range testCases {
tm, err := Strptime(test.format, test.in)
require.NoError(t, err)
s := tm.Format(time.RFC822Z)
require.Equal(t, test.expect, s)
}
// func TestStrptime(t *testing.T) {
// testCases := []struct{ format, in, expect string }{
// {"%a, %b %d, %Y", "Thu, Jun 29, 2017", "29 Jun 17 00:00 +0000"},
// {"%a, %b %d, %Y %H:%M", "Thu, Jun 29, 2017 15:30", "29 Jun 17 15:30 +0000"},
// // {"%a, %b %d, %Y %H:%M %Z", "Thu, Jun 29, 2017 15:30 UTC", "29 Jun 17 15:30 +0000"},
// }
// for _, test := range testCases {
// tm, err := Strptime(test.format, test.in)
// require.NoError(t, err)
// s := tm.Format(time.RFC822Z)
// require.Equal(t, test.expect, s)
// }
_, err := Strptime("%Y", "onvald")
require.Error(t, err)
}
// tm, err := Strptime("%a, %b %d, %Y %Z", "Thu, Jun 29, 2017 EDT")
// tm, err := Strptime("%a, %b %d, %Y %Z", "Thu, fdsafassJun 29, 2017 EDT")
// _, err := Strptime("%Y", "onvald")
// require.Error(t, err)
// }