tbabej/taskwiki
1
0
Fork 0
mirror of https://github.com/tbabej/taskwiki.git synced 2025-08-18 21:33:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

python3: Make tests work

Browse source
This commit is contained in:
Tomas Babej 2016-12-16 04:00:55 +01:00
parent ea04716147
commit dd0d4203f1
4 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/base.py
View file

@ -89,6 +89,16 @@ class IntegrationTest(object):
sleep(0.5) # Killing takes some time
self.tasks = self.__class__.tasks # Reset the task list
def py(self, command, silent=True, regex=None, lines=None, direct=False):
py_command = 'py ' if six.PY2 else 'py3 '
# Direct command communicate directly with the client
if direct:
return self.client.command(py_command + command)
else:
return self.command(py_command + command,
silent=silent, regex=regex, lines=lines)
def command(self, command, silent=True, regex=None, lines=None):
result = self.client.command(command)
@ -140,9 +150,9 @@ class IntegrationTest(object):
return False
# Assert that TW and cache objects exist
cache_class = self.client.command('py print(cache.__class__.__name__)')
tw_class = self.client.command(
'py print(cache.warriors["default"].__class__.__name__)')
cache_class = self.py('print(cache.__class__.__name__)', direct=True)
tw_class = self.py(
'print(cache.warriors["default"].__class__.__name__)', direct=True)
if not soft:
assert tw_class == 'TaskWarrior'

8
tests/test_selected.py
View file

@ -247,7 +247,7 @@ class TestInfoAction(IntegrationTest):
def execute(self):
self.command("TaskWikiInfo")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer info")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer info")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Name', 'Value'])
@ -276,7 +276,7 @@ class TestInfoActionTriggeredByEnter(IntegrationTest):
self.client.feedkeys("\\<CR>")
sleep(0.5)
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer info")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer info")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Name', 'Value'])
@ -304,7 +304,7 @@ class TestInfoActionMoved(IntegrationTest):
self.client.type('2gg') # Go to the second line
self.command("TaskWikiInfo")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer info")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer info")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Name', 'Value'])
@ -335,7 +335,7 @@ class TestInfoActionRange(IntegrationTest):
sleep(1)
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer info")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer info")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Name', 'Value'])

32
tests/test_splits.py
View file

@ -22,7 +22,7 @@ class TestBurndownDailySimple(IntegrationTest):
def execute(self):
self.command("TaskWikiBurndownDaily")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer burndown.daily")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer burndown.daily")
assert "Daily Burndown" in self.read_buffer()[0]
@ -30,7 +30,7 @@ class TestBurndownMonthlySimple(IntegrationTest):
def execute(self):
self.command("TaskWikiBurndownMonthly")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer burndown.monthly")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer burndown.monthly")
assert "Monthly Burndown" in self.read_buffer()[0]
@ -38,7 +38,7 @@ class TestBurndownWeeklySimple(IntegrationTest):
def execute(self):
self.command("TaskWikiBurndownWeekly")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer burndown.weekly")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer burndown.weekly")
assert "Weekly Burndown" in self.read_buffer()[0]
@ -46,7 +46,7 @@ class TestCalendarSimple(IntegrationTest):
def execute(self):
self.command("TaskWikiCalendar")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer calendar")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer calendar")
# Assert each day is displayed at least once.
output = self.read_buffer()
@ -65,7 +65,7 @@ class TestGhistoryAnnualSimple(IntegrationTest):
def execute(self):
self.command("TaskWikiGhistoryAnnual")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer ghistory.annual")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer ghistory.annual")
output = self.read_buffer()
header_words = ("Year", "Number", "Added", "Completed", "Deleted")
@ -90,7 +90,7 @@ class TestGhistoryMonthlySimple(IntegrationTest):
def execute(self):
self.command("TaskWikiGhistoryMonthly")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer ghistory.monthly")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer ghistory.monthly")
output = self.read_buffer()
header_words = ("Year", "Month", "Number", "Added", "Completed", "Deleted")
@ -117,7 +117,7 @@ class TestHistoryAnnualSimple(IntegrationTest):
def execute(self):
self.command("TaskWikiHistoryAnnual")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer history.annual")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer history.annual")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Year', 'Added', 'Completed', 'Deleted', 'Net'])
@ -138,7 +138,7 @@ class TestHistoryMonthlySimple(IntegrationTest):
def execute(self):
self.command("TaskWikiHistoryMonthly")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer history.monthly")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer history.monthly")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Year', 'Month', 'Added', 'Completed', 'Deleted', 'Net'])
@ -160,7 +160,7 @@ class TestProjectsSimple(IntegrationTest):
def execute(self):
self.command("TaskWikiProjects")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer projects")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer projects")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Project', 'Tasks'])
@ -186,7 +186,7 @@ class TestSummarySimple(IntegrationTest):
def execute(self):
self.command("TaskWikiProjectsSummary")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer summary")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer summary")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Project', 'Remaining', 'Avg age', 'Complete'])
@ -212,7 +212,7 @@ class TestStatsSimple(IntegrationTest):
def execute(self):
self.command("TaskWikiStats")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer stats")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer stats")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Category', 'Data'])
@ -234,7 +234,7 @@ class TestTagsSimple(IntegrationTest):
def execute(self):
self.command("TaskWikiTags")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer tags")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer tags")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Tag', 'Count'])
@ -258,7 +258,7 @@ class TestTagsSimpleFiltered(IntegrationTest):
def execute(self):
self.command("TaskWikiTags +chore")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer tags")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer tags")
output = '\n'.join(self.read_buffer())
header = r'\s*'.join(['Tag', 'Count'])
@ -274,12 +274,12 @@ class TestSplitReplacement(IntegrationTest):
def execute(self):
self.command("TaskWikiBurndownDaily")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer burndown.daily")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer burndown.daily")
assert "Daily Burndown" in self.read_buffer()[0]
self.command("TaskWikiBurndownDaily")
assert self.command(":py print vim.current.buffer", silent=False).startswith("<buffer burndown.daily")
assert self.py("print(vim.current.buffer)", silent=False).startswith("<buffer burndown.daily")
assert "Daily Burndown" in self.read_buffer()[0]
# Assert that there are only two buffers in the window
self.command(":py print len(vim.buffers)", regex='2$', lines=1)
self.py("print(len(vim.buffers))", regex='2$', lines=1)

4
tests/test_viewport.py
View file

@ -257,7 +257,7 @@ class TestViewportInspection(IntegrationTest):
self.client.feedkeys(r'\<CR>')
sleep(0.5)
assert self.command(":py print vim.current.buffer", regex="<buffer taskwiki.")
assert self.py("print(vim.current.buffer)", regex="<buffer taskwiki.")
class TestViewportInspectionWithVisibleTag(IntegrationTest):
@ -295,7 +295,7 @@ class TestViewportInspectionWithVisibleTag(IntegrationTest):
self.client.feedkeys(r'\<CR>')
sleep(0.5)
assert self.command(":py print vim.current.buffer", regex="<buffer taskwiki.")
assert self.py("print(vim.current.buffer)", regex="<buffer taskwiki.")
class TestViewportsUnicodeTaskGeneration(IntegrationTest):