Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uncomment and fix filter tests #241

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Uncomment and fix filter tests #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea6d5d8
uncomment 2 filter tests + simplify Eval labels
psethwick Aug 17, 2023
925adbd
apply item timezone and fix date filter tests
psethwick Aug 17, 2023
bec57b5
filter parser can now parse afternoon times in am/pm format
psethwick Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion completed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func CompletedList(c *cli.Context) error {
}

for _, item := range completed.Items {
result, err := Eval(ex, item, client.Store.Projects, client.Store.Labels)
result, err := Eval(ex, item, client.Store.Projects)
if err != nil {
return err
}
Expand Down
12 changes: 6 additions & 6 deletions filter_eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (

var priorityRegex = regexp.MustCompile("^p([1-4])$")

func Eval(e Expression, item todoist.AbstractItem, projects todoist.Projects, labels todoist.Labels) (result bool, err error) {
func Eval(e Expression, item todoist.AbstractItem, projects todoist.Projects) (result bool, err error) {
result = false
switch e.(type) {
case BoolInfixOpExpr:
e := e.(BoolInfixOpExpr)
lr, err := Eval(e.left, item, projects, labels)
rr, err := Eval(e.right, item, projects, labels)
lr, err := Eval(e.left, item, projects)
rr, err := Eval(e.right, item, projects)
if err != nil {
return false, nil
}
Expand All @@ -31,7 +31,7 @@ func Eval(e Expression, item todoist.AbstractItem, projects todoist.Projects, la
return EvalProject(e, item.GetProjectID(), projects), err
case LabelExpr:
e := e.(LabelExpr)
return EvalLabel(e, item.GetLabelNames(), labels), err
return EvalLabel(e, item.GetLabelNames()), err
case StringExpr:
switch item.(type) {
case *todoist.Item:
Expand All @@ -46,7 +46,7 @@ func Eval(e Expression, item todoist.AbstractItem, projects todoist.Projects, la
return EvalDate(e, item.DateTime()), err
case NotOpExpr:
e := e.(NotOpExpr)
r, err := Eval(e.expr, item, projects, labels)
r, err := Eval(e.expr, item, projects)
if err != nil {
return false, nil
}
Expand Down Expand Up @@ -109,7 +109,7 @@ func EvalProject(e ProjectExpr, projectID string, projects todoist.Projects) boo
return false
}

func EvalLabel(e LabelExpr, labelNames []string, labels todoist.Labels) bool {
func EvalLabel(e LabelExpr, labelNames []string) bool {
if e.name == "" {
return len(labelNames) == 0
}
Expand Down
76 changes: 32 additions & 44 deletions filter_eval_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,23 @@ func due(s string) *todoist.Due {
date := t.Format(todoist.RFC3339DateTime)
return &todoist.Due{
Date: date,
// these tests will break in other timezones
TimeZone: "Asia/Tokyo",
}
}

func testFilterEval(t *testing.T, f string, item todoist.Item, expect bool) {
actual, _ := Eval(Filter(f), &item, todoist.Projects{}, todoist.Labels{})
actual, _ := Eval(Filter(f), &item, todoist.Projects{})
assert.Equal(t, expect, actual, "they should be equal")
}

func testFilterEvalWithProject(t *testing.T, f string, item todoist.Item, projects todoist.Projects, expect bool) {
actual, _ := Eval(Filter(f), &item, projects, todoist.Labels{})
actual, _ := Eval(Filter(f), &item, projects)
assert.Equal(t, expect, actual, "they should be equal")
}

func testFilterEvalWithLabel(t *testing.T, f string, item todoist.Item, labels todoist.Labels, expect bool) {
actual, _ := Eval(Filter(f), &item, todoist.Projects{}, labels)
func testFilterEvalWithLabel(t *testing.T, f string, item todoist.Item, expect bool) {
actual, _ := Eval(Filter(f), &item, todoist.Projects{})
assert.Equal(t, expect, actual, "they should be equal")
}

Expand All @@ -47,26 +49,12 @@ func TestPriorityEval(t *testing.T) {
}

func TestLabelEval(t *testing.T) {
labels := todoist.Labels{
todoist.Label{
HaveID: todoist.HaveID{ID: "1"},
Name: "must",
},
todoist.Label{
HaveID: todoist.HaveID{ID: "2"},
Name: "icebox",
}, todoist.Label{
HaveID: todoist.HaveID{ID: "3"},
Name: "another",
},
}

item1 := todoist.Item{}
item1.LabelNames = []string{"1", "2"}
item1.LabelNames = []string{"must", "icebox"}

// testFilterEvalWithLabel(t, "@must", item1, labels, true)
// testFilterEvalWithLabel(t, "@icebox", item1, labels, true)
testFilterEvalWithLabel(t, "@another", item1, labels, false)
testFilterEvalWithLabel(t, "@must", item1, true)
testFilterEvalWithLabel(t, "@icebox", item1, true)
testFilterEvalWithLabel(t, "@another", item1, false)
}

func TestProjectEval(t *testing.T) {
Expand Down Expand Up @@ -114,16 +102,16 @@ func TestDueOnEval(t *testing.T) {
timeNow := time.Date(2017, time.October, 2, 1, 0, 0, 0, testTimeZone) // JST: Mon 2 Oct 2017 00:00:00
setNow(timeNow)

// testFilterEval(t, "today", todoist.Item{Due: due("Sun 1 Oct 2017 15:00:00 +0000")}, true) // JST: Mon 2 Oct 2017 00:00:00
// testFilterEval(t, "today", todoist.Item{Due: due("Mon 2 Oct 2017 14:59:59 +0000")}, true) // JST: Mon 2 Oct 2017 23:59:59
testFilterEval(t, "today", todoist.Item{Due: due("Sun 1 Oct 2017 15:00:00 +0000")}, true) // JST: Mon 2 Oct 2017 00:00:00
testFilterEval(t, "today", todoist.Item{Due: due("Mon 2 Oct 2017 14:59:59 +0000")}, true) // JST: Mon 2 Oct 2017 23:59:59
testFilterEval(t, "today", todoist.Item{Due: due("Mon 2 Oct 2017 15:00:00 +0000")}, false) // JST: Tue 3 Oct 2017 00:00:00

// testFilterEval(t, "yesterday", todoist.Item{Due: due("Sun 1 Oct 2017 14:59:59 +0000")}, true) // JST: Sun 1 Oct 2017 23:59:59
// testFilterEval(t, "yesterday", todoist.Item{Due: due("Sat 30 Sep 2017 15:00:00 +0000")}, true) // JST: Sun 1 Oct 2017 00:00:00
// testFilterEval(t, "yesterday", todoist.Item{Due: due("Sat 30 Sep 2017 14:59:59 +0000")}, false) // JST: Sat 30 Sept 2017 23:59:59
// testFilterEval(t, "tomorrow", todoist.Item{Due: due("Mon 2 Oct 2017 15:00:00 +0000")}, true) // JST: Tue 3 Oct 2017 00:00:00
// testFilterEval(t, "tomorrow", todoist.Item{Due: due("Tue 3 Oct 2017 14:59:59 +0000")}, true) // JST: Tue 3 Oct 2017 23:59:59
testFilterEval(t, "tomorrow", todoist.Item{Due: due("Tue 3 Oct 2017 15:00:00 +0000")}, false) // JST: Wed 4 Oct 2017 00:00:00
testFilterEval(t, "yesterday", todoist.Item{Due: due("Sun 1 Oct 2017 14:59:59 +0000")}, true) // JST: Sun 1 Oct 2017 23:59:59
testFilterEval(t, "yesterday", todoist.Item{Due: due("Sat 30 Sep 2017 15:00:00 +0000")}, true) // JST: Sun 1 Oct 2017 00:00:00
testFilterEval(t, "yesterday", todoist.Item{Due: due("Sat 30 Sep 2017 14:59:59 +0000")}, false) // JST: Sat 30 Sept 2017 23:59:59
testFilterEval(t, "tomorrow", todoist.Item{Due: due("Mon 2 Oct 2017 15:00:00 +0000")}, true) // JST: Tue 3 Oct 2017 00:00:00
testFilterEval(t, "tomorrow", todoist.Item{Due: due("Tue 3 Oct 2017 14:59:59 +0000")}, true) // JST: Tue 3 Oct 2017 23:59:59
testFilterEval(t, "tomorrow", todoist.Item{Due: due("Tue 3 Oct 2017 15:00:00 +0000")}, false) // JST: Wed 4 Oct 2017 00:00:00

testFilterEval(t, "10/2/2017", todoist.Item{Due: due("Mon 2 Oct 2017 01:00:00 +0000")}, true) // JST: Mon 2 Oct 2017 10:00:00
testFilterEval(t, "10/2/2017 10:00", todoist.Item{Due: due("Mon 2 Oct 2017 01:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 10:00:00
Expand All @@ -140,10 +128,10 @@ func TestDueBeforeEval(t *testing.T) {
timeNow := time.Date(2017, time.October, 2, 1, 0, 0, 0, testTimeZone) // JST: Mon 2 Oct 2017 00:00:00
setNow(timeNow)

testFilterEval(t, "due before: 10/2/2017", todoist.Item{Due: due("Sun 1 Oct 2017 15:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 00:00:00
// testFilterEval(t, "due before: 10/2/2017", todoist.Item{Due: due("Sun 1 Oct 2017 14:59:59 +0000")}, true) // JST: Sun 1 Oct 2017 23:59:59
testFilterEval(t, "due before: 10/2/2017", todoist.Item{Due: due("Sun 1 Oct 2017 15:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 00:00:00
testFilterEval(t, "due before: 10/2/2017", todoist.Item{Due: due("Sun 1 Oct 2017 14:59:59 +0000")}, true) // JST: Sun 1 Oct 2017 23:59:59
testFilterEval(t, "due before: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 4:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 13:00:00
// testFilterEval(t, "due before: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 3:59:00 +0000")}, true) // JST: Mon 2 Oct 2017 12:59:00
testFilterEval(t, "due before: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 3:59:00 +0000")}, true) // JST: Mon 2 Oct 2017 12:59:00

testFilterEval(t, "due before: 10/2/2017 13:00", todoist.Item{Due: nil}, false) // JST: Mon 2 Oct 2017 12:59:00
}
Expand All @@ -152,22 +140,22 @@ func TestOverDueEval(t *testing.T) {
timeNow := time.Date(2017, time.October, 2, 12, 0, 0, 0, testTimeZone) // JST: Mon 2 Oct 2017 12:00:00
setNow(timeNow)

// testFilterEval(t, "over due", todoist.Item{Due: due("Mon 2 Oct 2017 2:59:00 +0000")}, true) // JST: Mon 2 Oct 2017 11:59:00
// testFilterEval(t, "over due", todoist.Item{Due: due("Mon 2 Oct 2017 3:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 12:00:00
// testFilterEval(t, "od", todoist.Item{Due: due("Mon 2 Oct 2017 2:59:00 +0000")}, true) // JST: Mon 2 Oct 2017 11:59:00
// testFilterEval(t, "od", todoist.Item{Due: due("Mon 2 Oct 2017 3:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 12:00:00
testFilterEval(t, "over due", todoist.Item{Due: due("Mon 2 Oct 2017 2:59:00 +0000")}, true) // JST: Mon 2 Oct 2017 11:59:00
testFilterEval(t, "over due", todoist.Item{Due: due("Mon 2 Oct 2017 3:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 12:00:00
testFilterEval(t, "od", todoist.Item{Due: due("Mon 2 Oct 2017 2:59:00 +0000")}, true) // JST: Mon 2 Oct 2017 11:59:00
testFilterEval(t, "od", todoist.Item{Due: due("Mon 2 Oct 2017 3:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 12:00:00

// testFilterEval(t, "od", todoist.Item{Due: nil}, false) // JST: Mon 2 Oct 2017 12:00:00
testFilterEval(t, "od", todoist.Item{Due: nil}, false) // JST: Mon 2 Oct 2017 12:00:00
}

func TestDueAfterEval(t *testing.T) {
timeNow := time.Date(2017, time.October, 2, 1, 0, 0, 0, testTimeZone) // JST: Mon 2 Oct 2017 00:00:00
setNow(timeNow)

//testFilterEval(t, "due after: 10/2/2017", todoist.Item{Due: due("Mon 2 Oct 2017 14:59:59 +0000")}, false) // JST: Mon 2 Oct 2017 23:59:59
//testFilterEval(t, "due after: 10/2/2017", todoist.Item{Due: due("Mon 2 Oct 2017 15:00:00 +0000")}, true) // JST: Tue 3 Oct 2017 00:00:00
//testFilterEval(t, "due after: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 4:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 13:00:00
//testFilterEval(t, "due after: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 4:01:00 +0000")}, true) // JST: Mon 2 Oct 2017 13:01:00
//
//testFilterEval(t, "due after: 10/2/2017 13:00", todoist.Item{Due: nil}, false) // JST: Mon 2 Oct 2017 13:01:00
testFilterEval(t, "due after: 10/2/2017", todoist.Item{Due: due("Mon 2 Oct 2017 14:59:59 +0000")}, false) // JST: Mon 2 Oct 2017 23:59:59
testFilterEval(t, "due after: 10/2/2017", todoist.Item{Due: due("Mon 2 Oct 2017 15:00:00 +0000")}, true) // JST: Tue 3 Oct 2017 00:00:00
testFilterEval(t, "due after: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 4:00:00 +0000")}, false) // JST: Mon 2 Oct 2017 13:00:00
testFilterEval(t, "due after: 10/2/2017 13:00", todoist.Item{Due: due("Mon 2 Oct 2017 4:01:00 +0000")}, true) // JST: Mon 2 Oct 2017 13:01:00

testFilterEval(t, "due after: 10/2/2017 13:00", todoist.Item{Due: nil}, false) // JST: Mon 2 Oct 2017 13:01:00
}
Loading