From 91ecffc6b3e1d7bdc7ac0fe82ef554bfd33d77e3 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 22 Sep 2016 10:20:36 -0400 Subject: [PATCH] Update tests --- tests/test_viewport_parsing.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/test_viewport_parsing.py b/tests/test_viewport_parsing.py index 40a5bc5..59d6a01 100644 --- a/tests/test_viewport_parsing.py +++ b/tests/test_viewport_parsing.py @@ -27,7 +27,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.sort == DEFAULT_SORT_ORDER assert port.tw == 'default' @@ -36,7 +36,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home | +home ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.defaults == {'tags':['home']} assert port.sort == DEFAULT_SORT_ORDER @@ -46,7 +46,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home #T ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.sort == DEFAULT_SORT_ORDER assert port.tw == 'extra' @@ -55,7 +55,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home $T ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.sort == 'extra' assert port.tw == 'default' @@ -64,7 +64,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home or project:Work $T ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home", "or", "project:Work"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", "or", "project:Work", ")"] assert port.name == "Test" assert port.sort == 'extra' assert port.tw == 'default' @@ -73,7 +73,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home #T $T ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.sort == 'extra' assert port.tw == 'extra' @@ -82,7 +82,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home | +home #T ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.defaults == {'tags':['home']} assert port.sort == DEFAULT_SORT_ORDER @@ -92,7 +92,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home | +home #T $T ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] + assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"] assert port.name == "Test" assert port.defaults == {'tags':['home']} assert port.sort == 'extra' @@ -102,7 +102,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home !?DELETED ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == ["-PARENT", "project:Home"] + assert port.taskfilter == ["-PARENT", "(", "project:Home", ")"] assert port.name == "Test" assert port.defaults == {'project':'Home'} assert port.sort == DEFAULT_SORT_ORDER @@ -112,7 +112,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home !+DELETED ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == ["+DELETED", "-PARENT", "project:Home"] + assert port.taskfilter == ["+DELETED", "-PARENT", "(", "project:Home", ")"] assert port.name == "Test" assert port.defaults == {'project':'Home'} assert port.sort == DEFAULT_SORT_ORDER @@ -122,7 +122,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home !-DELETED ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == ["-DELETED", "-PARENT","project:Home"] + assert port.taskfilter == ["-DELETED", "-PARENT", "(", "project:Home", ")"] assert port.name == "Test" assert port.defaults == {'project':'Home'} assert port.sort == DEFAULT_SORT_ORDER @@ -132,7 +132,7 @@ class TestParsingVimwikiTask(object): self.cache.buffer[0] = "== Test | project:Home +DELETED ==" port = self.ViewPort.from_line(0, self.cache) - assert port.taskfilter == ["-PARENT", "project:Home", "+DELETED"] + assert port.taskfilter == ["-PARENT", "(", "project:Home", "+DELETED", ")"] assert port.name == "Test" assert port.defaults == {'project':'Home'} assert port.sort == DEFAULT_SORT_ORDER