From 00711bbb63cef0afbf8b5c067ddb63e6f6cbd620 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sat, 15 Aug 2015 15:22:03 +0200 Subject: [PATCH] tests: Move cache setup into per test setup method --- tests/test_viewport_parsing.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_viewport_parsing.py b/tests/test_viewport_parsing.py index 9c777a7..f0ae9f0 100644 --- a/tests/test_viewport_parsing.py +++ b/tests/test_viewport_parsing.py @@ -9,16 +9,16 @@ sys.modules['vim'] = mockvim from taskwiki.viewport import ViewPort from taskwiki.constants import DEFAULT_SORT_ORDER, DEFAULT_VIEWPORT_VIRTUAL_TAGS -cache = MockCache() class TestParsingVimwikiTask(object): def setup(self): self.mockvim = MockVim() + self.cache = MockCache() sys.modules['vim'] = self.mockvim def test_simple(self): self.mockvim.current.buffer[0] = "== Test | project:Home ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test" @@ -27,7 +27,7 @@ class TestParsingVimwikiTask(object): def test_defaults(self): self.mockvim.current.buffer[0] = "== Test | project:Home | +home ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test" @@ -37,7 +37,7 @@ class TestParsingVimwikiTask(object): def test_different_tw(self): self.mockvim.current.buffer[0] = "== Test | project:Home #T ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test" @@ -46,7 +46,7 @@ class TestParsingVimwikiTask(object): def test_different_sort(self): self.mockvim.current.buffer[0] = "== Test | project:Home $T ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test" @@ -55,7 +55,7 @@ class TestParsingVimwikiTask(object): def test_different_sort_with_complex_filter(self): self.mockvim.current.buffer[0] = "== Test | project:Home or project:Work $T ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home", "or", "project:Work"] assert port.name == "Test" @@ -64,7 +64,7 @@ class TestParsingVimwikiTask(object): def test_different_sort_tw(self): self.mockvim.current.buffer[0] = "== Test | project:Home #T $T ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test" @@ -73,7 +73,7 @@ class TestParsingVimwikiTask(object): def test_defaults_different_tw(self): self.mockvim.current.buffer[0] = "== Test | project:Home | +home #T ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test" @@ -83,7 +83,7 @@ class TestParsingVimwikiTask(object): def test_defaults_different_tw_sort(self): self.mockvim.current.buffer[0] = "== Test | project:Home | +home #T $T ==" - port = ViewPort.from_line(0, cache) + port = ViewPort.from_line(0, self.cache) assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"] assert port.name == "Test"