Skip to content

T
topydo
Commit 590f0e74 authored by Bram Schoenmakers's avatar Bram Schoenmakers
Browse files
Options

Surround todo identifier with bars in output.

parent 241aa3e9
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 70 deletions
test/AddCommandTest.py
View file @ 590f0e74
# Topydo - A todo.txt client written in Python. # Topydo - A todo.txt client written in Python.
# Copyright (C) 2014 Bram Schoenmakers <me@bramschoenmakers.nl> # Copyright (C) 2014 Bram Schoenmakers <me@bramschoenmakers.nl>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
...@@ -113,7 +113,7 @@ class AddCommandTest(CommandTest.CommandTest): ...@@ -113,7 +113,7 @@ class AddCommandTest(CommandTest.CommandTest):
self.assertFalse(self.todolist.todo(1).has_tag("after")) self.assertFalse(self.todolist.todo(1).has_tag("after"))
self.assertEquals(self.todolist.todo(1).source(), self.today + " Foo") self.assertEquals(self.todolist.todo(1).source(), self.today + " Foo")
self.assertEquals(self.output, " 1 " + str(self.todolist.todo(1)) + "\n") self.assertEquals(self.output, "| 1| " + str(self.todolist.todo(1)) + "\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_add_dep4(self): def test_add_dep4(self):
...@@ -123,7 +123,7 @@ class AddCommandTest(CommandTest.CommandTest): ...@@ -123,7 +123,7 @@ class AddCommandTest(CommandTest.CommandTest):
self.assertFalse(self.todolist.todo(1).has_tag("after")) self.assertFalse(self.todolist.todo(1).has_tag("after"))
self.assertEquals(self.todolist.todo(1).source(), self.today + " Foo") self.assertEquals(self.todolist.todo(1).source(), self.today + " Foo")
self.assertEquals(self.output, " 1 " + str(self.todolist.todo(1)) + "\n") self.assertEquals(self.output, "| 1| " + str(self.todolist.todo(1)) + "\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_add_dep5(self): def test_add_dep5(self):
...@@ -167,7 +167,7 @@ class AddCommandTest(CommandTest.CommandTest): ...@@ -167,7 +167,7 @@ class AddCommandTest(CommandTest.CommandTest):
command = AddCommand.AddCommand(["Foo t:today due:today"], self.todolist, self.out, self.error) command = AddCommand.AddCommand(["Foo t:today due:today"], self.todolist, self.out, self.error)
command.execute() command.execute()
result = " 1 %s Foo t:%s due:%s\n" % (self.today, self.today, self.today) result = "| 1| %s Foo t:%s due:%s\n" % (self.today, self.today, self.today)
self.assertEquals(self.output, result) self.assertEquals(self.output, result)
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
......
test/AppendCommandTest.py
View file @ 590f0e74
# Topydo - A todo.txt client written in Python. # Topydo - A todo.txt client written in Python.
# Copyright (C) 2014 Bram Schoenmakers <me@bramschoenmakers.nl> # Copyright (C) 2014 Bram Schoenmakers <me@bramschoenmakers.nl>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
...@@ -27,7 +27,7 @@ class AppendCommandTest(CommandTest.CommandTest): ...@@ -27,7 +27,7 @@ class AppendCommandTest(CommandTest.CommandTest):
command = AppendCommand.AppendCommand([1, "Bar"], self.todolist, self.out, self.error) command = AppendCommand.AppendCommand([1, "Bar"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEqual(self.output, " 1 Foo Bar\n") self.assertEqual(self.output, "| 1| Foo Bar\n")
self.assertEqual(self.errors, "") self.assertEqual(self.errors, "")
def test_append2(self): def test_append2(self):
...@@ -55,7 +55,7 @@ class AppendCommandTest(CommandTest.CommandTest): ...@@ -55,7 +55,7 @@ class AppendCommandTest(CommandTest.CommandTest):
command = AppendCommand.AppendCommand([1, "Bar", "Baz"], self.todolist, self.out, self.error) command = AppendCommand.AppendCommand([1, "Bar", "Baz"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEqual(self.output, " 1 Foo Bar Baz\n") self.assertEqual(self.output, "| 1| Foo Bar Baz\n")
self.assertEqual(self.errors, "") self.assertEqual(self.errors, "")
def test_append6(self): def test_append6(self):
......
test/DeleteCommandTest.py
View file @ 590f0e74
...@@ -33,7 +33,7 @@ class DeleteCommandTest(CommandTest.CommandTest): ...@@ -33,7 +33,7 @@ class DeleteCommandTest(CommandTest.CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).source(), "Bar") self.assertEquals(self.todolist.todo(1).source(), "Bar")
self.assertEquals(self.output, " 2 Bar p:1\nRemoved: Foo id:1\n") self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_del1_regex(self): def test_del1_regex(self):
...@@ -42,7 +42,7 @@ class DeleteCommandTest(CommandTest.CommandTest): ...@@ -42,7 +42,7 @@ class DeleteCommandTest(CommandTest.CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).source(), "Bar") self.assertEquals(self.todolist.todo(1).source(), "Bar")
self.assertEquals(self.output, " 2 Bar p:1\nRemoved: Foo id:1\n") self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_del2(self): def test_del2(self):
...@@ -51,7 +51,7 @@ class DeleteCommandTest(CommandTest.CommandTest): ...@@ -51,7 +51,7 @@ class DeleteCommandTest(CommandTest.CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.count(), 0) self.assertEquals(self.todolist.count(), 0)
self.assertEquals(self.output, " 2 Bar p:1\nRemoved: Bar\nRemoved: Foo\n") self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Bar\nRemoved: Foo\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_del3(self): def test_del3(self):
...@@ -60,7 +60,7 @@ class DeleteCommandTest(CommandTest.CommandTest): ...@@ -60,7 +60,7 @@ class DeleteCommandTest(CommandTest.CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.count(), 1) # force won't delete subtasks self.assertEquals(self.todolist.count(), 1) # force won't delete subtasks
self.assertEquals(self.output, " 2 Bar p:1\nRemoved: Foo id:1\n") self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_del4(self): def test_del4(self):
...@@ -69,7 +69,7 @@ class DeleteCommandTest(CommandTest.CommandTest): ...@@ -69,7 +69,7 @@ class DeleteCommandTest(CommandTest.CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.count(), 1) # force won't delete subtasks self.assertEquals(self.todolist.count(), 1) # force won't delete subtasks
self.assertEquals(self.output, " 2 Bar p:1\nRemoved: Foo id:1\n") self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_del5(self): def test_del5(self):
......
test/DepCommandTest.py
View file @ 590f0e74
...@@ -165,7 +165,7 @@ class DepCommandTest(CommandTest.CommandTest): ...@@ -165,7 +165,7 @@ class DepCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 Bar p:1\n 3 Baz p:1\n") self.assertEquals(self.output, "| 2| Bar p:1\n| 3| Baz p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_ls2(self): def test_ls2(self):
...@@ -181,7 +181,7 @@ class DepCommandTest(CommandTest.CommandTest): ...@@ -181,7 +181,7 @@ class DepCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 Foo id:1\n") self.assertEquals(self.output, "| 1| Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_ls4(self): def test_ls4(self):
......
test/DoCommandTest.py
View file @ 590f0e74
...@@ -58,7 +58,7 @@ class DoCommandTest(CommandTest.CommandTest): ...@@ -58,7 +58,7 @@ class DoCommandTest(CommandTest.CommandTest):
command = DoCommand.DoCommand(["1"], self.todolist, self.out, self.error, _yes_prompt) command = DoCommand.DoCommand(["1"], self.todolist, self.out, self.error, _yes_prompt)
command.execute() command.execute()
result = " 2 Bar p:1\n 3 Baz p:1\nCompleted: x %s Bar p:1\nCompleted: x %s Baz p:1\nCompleted: x %s Foo id:1\n" % (self.today, self.today, self.today) result = "| 2| Bar p:1\n| 3| Baz p:1\nCompleted: x %s Bar p:1\nCompleted: x %s Baz p:1\nCompleted: x %s Foo id:1\n" % (self.today, self.today, self.today)
for number in [1, 2, 3]: for number in [1, 2, 3]:
self.assertTrue(self.todolist.todo(number).is_completed()) self.assertTrue(self.todolist.todo(number).is_completed())
...@@ -72,7 +72,7 @@ class DoCommandTest(CommandTest.CommandTest): ...@@ -72,7 +72,7 @@ class DoCommandTest(CommandTest.CommandTest):
command = DoCommand.DoCommand(["1"], self.todolist, self.out, self.error, _no_prompt) command = DoCommand.DoCommand(["1"], self.todolist, self.out, self.error, _no_prompt)
command.execute() command.execute()
result = " 2 Bar p:1\n 3 Baz p:1\nCompleted: x %s Foo id:1\n" % self.today result = "| 2| Bar p:1\n| 3| Baz p:1\nCompleted: x %s Foo id:1\n" % self.today
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(1).is_completed()) self.assertTrue(self.todolist.todo(1).is_completed())
...@@ -121,7 +121,7 @@ class DoCommandTest(CommandTest.CommandTest): ...@@ -121,7 +121,7 @@ class DoCommandTest(CommandTest.CommandTest):
self._recurrence_helper(["4"]) self._recurrence_helper(["4"])
self.assertTrue(self.todolist.todo(4).is_completed()) self.assertTrue(self.todolist.todo(4).is_completed())
result = " 9 %s Recurring! rec:1d due:%s\nCompleted: x %s Recurring! rec:1d\n" % (self.today, self.tomorrow, self.today) result = "| 9| %s Recurring! rec:1d due:%s\nCompleted: x %s Recurring! rec:1d\n" % (self.today, self.tomorrow, self.today)
self.assertEquals(self.output, result) self.assertEquals(self.output, result)
todo = self.todolist.todo(8) todo = self.todolist.todo(8)
...@@ -130,13 +130,13 @@ class DoCommandTest(CommandTest.CommandTest): ...@@ -130,13 +130,13 @@ class DoCommandTest(CommandTest.CommandTest):
def test_strict_recurrence1(self): def test_strict_recurrence1(self):
self._recurrence_helper(["-s", "8"]) self._recurrence_helper(["-s", "8"])
result = " 9 2014-11-19 Strict due:2014-01-02 rec:1d\nCompleted: x 2014-11-19 Strict due:2014-01-01 rec:1d\n" result = "| 9| 2014-11-19 Strict due:2014-01-02 rec:1d\nCompleted: x 2014-11-19 Strict due:2014-01-01 rec:1d\n"
self.assertEquals(self.output, result) self.assertEquals(self.output, result)
def test_strict_recurrence2(self): def test_strict_recurrence2(self):
self._recurrence_helper(["--strict", "8"]) self._recurrence_helper(["--strict", "8"])
result = " 9 2014-11-19 Strict due:2014-01-02 rec:1d\nCompleted: x 2014-11-19 Strict due:2014-01-01 rec:1d\n" result = "| 9| 2014-11-19 Strict due:2014-01-02 rec:1d\nCompleted: x 2014-11-19 Strict due:2014-01-01 rec:1d\n"
self.assertEquals(self.output, result) self.assertEquals(self.output, result)
def test_invalid1(self): def test_invalid1(self):
...@@ -208,7 +208,7 @@ class DoCommandTest(CommandTest.CommandTest): ...@@ -208,7 +208,7 @@ class DoCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 Bar p:1\n 3 Baz p:1\nCompleted: x 2014-11-18 Bar p:1\nCompleted: x 2014-11-18 Baz p:1\nCompleted: x 2014-11-18 Foo id:1\n") self.assertEquals(self.output, "| 2| Bar p:1\n| 3| Baz p:1\nCompleted: x 2014-11-18 Bar p:1\nCompleted: x 2014-11-18 Baz p:1\nCompleted: x 2014-11-18 Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_do_custom_date3(self): def test_do_custom_date3(self):
......
test/ListCommandTest.py
View file @ 590f0e74
...@@ -32,7 +32,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -32,7 +32,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n 4 (C) Drink beer @ home\n 5 (C) 13 + 29 = 42\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n| 4| (C) Drink beer @ home\n| 5| (C) 13 + 29 = 42\n| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list3(self): def test_list3(self):
...@@ -40,7 +40,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -40,7 +40,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list4(self): def test_list4(self):
...@@ -48,7 +48,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -48,7 +48,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 3 (C) Baz @Context1 +Project1 key:value id:1\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 3| (C) Baz @Context1 +Project1 key:value id:1\n| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list5(self): def test_list5(self):
...@@ -56,7 +56,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -56,7 +56,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n 3 (C) Baz @Context1 +Project1 key:value id:1\n 4 (C) Drink beer @ home\n 5 (C) 13 + 29 = 42\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n| 3| (C) Baz @Context1 +Project1 key:value id:1\n| 4| (C) Drink beer @ home\n| 5| (C) 13 + 29 = 42\n| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list6(self): def test_list6(self):
...@@ -72,7 +72,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -72,7 +72,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 3 (C) Baz @Context1 +Project1 key:value id:1\n 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n") self.assertEquals(self.output, "| 3| (C) Baz @Context1 +Project1 key:value id:1\n| 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list8(self): def test_list8(self):
...@@ -80,7 +80,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -80,7 +80,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 4 (C) Drink beer @ home\n 5 (C) 13 + 29 = 42\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 4| (C) Drink beer @ home\n| 5| (C) 13 + 29 = 42\n| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list9(self): def test_list9(self):
...@@ -88,7 +88,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -88,7 +88,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 5 (C) 13 + 29 = 42\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 5| (C) 13 + 29 = 42\n| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list10(self): def test_list10(self):
...@@ -96,7 +96,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -96,7 +96,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list11(self): def test_list11(self):
...@@ -106,7 +106,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -106,7 +106,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n") self.assertEquals(self.output, "| 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list12(self): def test_list12(self):
...@@ -116,7 +116,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -116,7 +116,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n 3 (C) Baz @Context1 +Project1 key:value id:1\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n| 3| (C) Baz @Context1 +Project1 key:value id:1\n| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list13(self): def test_list13(self):
...@@ -124,7 +124,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -124,7 +124,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n 3 (C) Baz @Context1 +Project1 key:value id:1\n 4 (C) Drink beer @ home\n 5 (C) 13 + 29 = 42\n") self.assertEquals(self.output, "| 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n| 3| (C) Baz @Context1 +Project1 key:value id:1\n| 4| (C) Drink beer @ home\n| 5| (C) 13 + 29 = 42\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list14(self): def test_list14(self):
...@@ -134,7 +134,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -134,7 +134,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 (C) Foo @Context2 Not@Context +Project1 Not+Project\n 4 (C) Drink beer @ home\n 5 (C) 13 + 29 = 42\n 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, " | 1| (C) Foo @Context2 Not@Context +Project1 Not+Project\n | 4| (C) Drink beer @ home\n | 5| (C) 13 + 29 = 42\n | 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list15(self): def test_list15(self):
...@@ -142,7 +142,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -142,7 +142,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "| 2| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_list16(self): def test_list16(self):
...@@ -152,7 +152,7 @@ class ListCommandTest(CommandTest.CommandTest): ...@@ -152,7 +152,7 @@ class ListCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "6iu (C) Foo @Context2 Not@Context +Project1 Not+Project\ntil (C) Drink beer @ home\n c5 (C) 13 + 29 = 42\nxvb (D) Bar @Context1 +Project2 p:1\n") self.assertEquals(self.output, "|6iu| (C) Foo @Context2 Not@Context +Project1 Not+Project\n|til| (C) Drink beer @ home\n| c5| (C) 13 + 29 = 42\n|xvb| (D) Bar @Context1 +Project2 p:1\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_help(self): def test_help(self):
......
test/PostponeCommandTest.py
View file @ 590f0e74
# Topydo - A todo.txt client written in Python. # Topydo - A todo.txt client written in Python.
# Copyright (C) 2014 Bram Schoenmakers <me@bramschoenmakers.nl> # Copyright (C) 2014 Bram Schoenmakers <me@bramschoenmakers.nl>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
...@@ -45,7 +45,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -45,7 +45,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.today + timedelta(7) due = self.today + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 Foo due:%s\n" % due.isoformat()) self.assertEquals(self.output, "| 1| Foo due:%s\n" % due.isoformat())
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone2(self): def test_postpone2(self):
...@@ -55,9 +55,9 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -55,9 +55,9 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.today + timedelta(7) due = self.today + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 Bar due:%s\n" % due.isoformat()) self.assertEquals(self.output, "| 2| Bar due:%s\n" % due.isoformat())
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone3(self): def test_postpone3(self):
command = PostponeCommand.PostponeCommand(["-s", "2", "1w"], self.todolist, self.out, self.error) command = PostponeCommand.PostponeCommand(["-s", "2", "1w"], self.todolist, self.out, self.error)
command.execute() command.execute()
...@@ -65,7 +65,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -65,7 +65,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.today + timedelta(7) due = self.today + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 Bar due:%s\n" % due.isoformat()) self.assertEquals(self.output, "| 2| Bar due:%s\n" % due.isoformat())
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone4(self): def test_postpone4(self):
...@@ -75,7 +75,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -75,7 +75,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.today + timedelta(7) due = self.today + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 3 Baz due:%s t:%s\n" % (due.isoformat(), self.start.isoformat())) self.assertEquals(self.output, "| 3| Baz due:%s t:%s\n" % (due.isoformat(), self.start.isoformat()))
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone5(self): def test_postpone5(self):
...@@ -86,7 +86,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -86,7 +86,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
start = self.start + timedelta(7) start = self.start + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 3 Baz due:%s t:%s\n" % (due.isoformat(), start.isoformat())) self.assertEquals(self.output, "| 3| Baz due:%s t:%s\n" % (due.isoformat(), start.isoformat()))
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone6(self): def test_postpone6(self):
...@@ -96,7 +96,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -96,7 +96,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.today + timedelta(7) due = self.today + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 4 Past due:%s\n" % due.isoformat()) self.assertEquals(self.output, "| 4| Past due:%s\n" % due.isoformat())
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone7(self): def test_postpone7(self):
...@@ -106,7 +106,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -106,7 +106,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.future + timedelta(7) due = self.future + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 5 Future due:%s t:%s\n" % (due.isoformat(), self.future_start.isoformat())) self.assertEquals(self.output, "| 5| Future due:%s t:%s\n" % (due.isoformat(), self.future_start.isoformat()))
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone8(self): def test_postpone8(self):
...@@ -117,7 +117,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -117,7 +117,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
start = self.future_start + timedelta(7) start = self.future_start + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 5 Future due:%s t:%s\n" % (due.isoformat(), start.isoformat())) self.assertEquals(self.output, "| 5| Future due:%s t:%s\n" % (due.isoformat(), start.isoformat()))
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_postpone9(self): def test_postpone9(self):
...@@ -159,7 +159,7 @@ class PostponeCommandTest(CommandTest.CommandTest): ...@@ -159,7 +159,7 @@ class PostponeCommandTest(CommandTest.CommandTest):
due = self.today + timedelta(7) due = self.today + timedelta(7)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 Foo due:%s\n" % due.isoformat()) self.assertEquals(self.output, "| 1| Foo due:%s\n" % due.isoformat())
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_help(self): def test_help(self):
......
test/TagCommandTest.py
View file @ 590f0e74
...@@ -34,7 +34,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -34,7 +34,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertEquals(self.todolist.todo(1).source(), "Foo due:2014-10-22") self.assertEquals(self.todolist.todo(1).source(), "Foo due:2014-10-22")
self.assertEquals(self.output, " 1 Foo due:2014-10-22\n") self.assertEquals(self.output, "| 1| Foo due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
...@@ -43,7 +43,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -43,7 +43,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertEquals(self.todolist.todo(1).source(), "Foo due:2014-10-22") self.assertEquals(self.todolist.todo(1).source(), "Foo due:2014-10-22")
self.assertEquals(self.output, " 1 Foo due:2014-10-22\n") self.assertEquals(self.output, "| 1| Foo due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
...@@ -52,7 +52,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -52,7 +52,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertEquals(self.todolist.todo(2).source(), "Bar due:2014-10-22 due:2014-10-19") self.assertEquals(self.todolist.todo(2).source(), "Bar due:2014-10-22 due:2014-10-19")
self.assertEquals(self.output, " 2 Bar due:2014-10-22 due:2014-10-19\n") self.assertEquals(self.output, "| 2| Bar due:2014-10-22 due:2014-10-19\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
...@@ -69,7 +69,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -69,7 +69,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 3 Baz due:2014-10-20\n") self.assertEquals(self.output, "| 3| Baz due:2014-10-20\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_set_tag5(self): def test_set_tag5(self):
...@@ -77,7 +77,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -77,7 +77,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-20\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-20\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_set_tag6(self): def test_set_tag6(self):
...@@ -85,7 +85,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -85,7 +85,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-22\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_set_tag7(self): def test_set_tag7(self):
...@@ -93,7 +93,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -93,7 +93,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-20\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-20\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_set_tag8(self): def test_set_tag8(self):
...@@ -101,7 +101,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -101,7 +101,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-22\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_set_tag9(self): def test_set_tag9(self):
...@@ -109,7 +109,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -109,7 +109,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-22\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_set_tag10(self): def test_set_tag10(self):
...@@ -117,7 +117,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -117,7 +117,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 4 Fnord due:2014-10-20 due:2014-10-20\n") self.assertEquals(self.output, "| 4| Fnord due:2014-10-20 due:2014-10-20\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag1(self): def test_rm_tag1(self):
...@@ -125,7 +125,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -125,7 +125,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1 Foo\n") self.assertEquals(self.output, "| 1| Foo\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag2(self): def test_rm_tag2(self):
...@@ -133,7 +133,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -133,7 +133,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 2 Bar\n") self.assertEquals(self.output, "| 2| Bar\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag3(self): def test_rm_tag3(self):
...@@ -141,7 +141,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -141,7 +141,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag4(self): def test_rm_tag4(self):
...@@ -149,7 +149,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -149,7 +149,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-22\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag6(self): def test_rm_tag6(self):
...@@ -157,7 +157,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -157,7 +157,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-22\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag7(self): def test_rm_tag7(self):
...@@ -165,7 +165,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -165,7 +165,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n 4 Fnord due:2014-10-20 due:2014-10-22\n") self.assertEquals(self.output, " 1. 2014-10-20\n 2. 2014-10-22\n| 4| Fnord due:2014-10-20 due:2014-10-22\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_rm_tag8(self): def test_rm_tag8(self):
...@@ -189,7 +189,7 @@ class TagCommandTest(CommandTest.CommandTest): ...@@ -189,7 +189,7 @@ class TagCommandTest(CommandTest.CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, " 4 Fnord\n") self.assertEquals(self.output, "| 4| Fnord\n")
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
def test_help(self): def test_help(self):
......
topydo/lib/TodoListBase.py
View file @ 590f0e74
...@@ -201,9 +201,9 @@ class TodoListBase(object): ...@@ -201,9 +201,9 @@ class TodoListBase(object):
printed todo. printed todo.
""" """
if config().identifiers() == 'text': if config().identifiers() == 'text':
return lambda p_todo_str, p_todo: "%3s %s" % (self._todo_id_map[p_todo], p_todo_str) return lambda p_todo_str, p_todo: "|%3s| %s" % (self._todo_id_map[p_todo], p_todo_str)
else: else:
return lambda p_todo_str, p_todo: "%3d %s" % (self.number(p_todo), p_todo_str) return lambda p_todo_str, p_todo: "|%3d| %s" % (self.number(p_todo), p_todo_str)
def _update_todo_ids(self): def _update_todo_ids(self):
# the idea is to have a hash that is independent of the position of the # the idea is to have a hash that is independent of the position of the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7