Skip to content

T
topydo
Commit 7104428d authored by Bram Schoenmakers's avatar Bram Schoenmakers
Browse files
Options

assertEquals is deprecated, global replace-all to assertEqual.

parent 8a243132
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 515 additions and 515 deletions
test/AddCommandTest.py
View file @ 7104428d
This diff is collapsed.
test/AppendCommandTest.py
View file @ 7104428d
...@@ -79,8 +79,8 @@ class AppendCommandTest(CommandTest): ...@@ -79,8 +79,8 @@ class AppendCommandTest(CommandTest):
command = AppendCommand(["help"], self.todolist, self.out, self.error) command = AppendCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/ArchiveCommandTest.py
View file @ 7104428d
...@@ -31,8 +31,8 @@ class ArchiveCommandTest(CommandTest): ...@@ -31,8 +31,8 @@ class ArchiveCommandTest(CommandTest):
self.assertTrue(todolist.is_dirty()) self.assertTrue(todolist.is_dirty())
self.assertTrue(archive.is_dirty()) self.assertTrue(archive.is_dirty())
self.assertEquals(str(todolist), "x Not complete\n(C) Active") self.assertEqual(str(todolist), "x Not complete\n(C) Active")
self.assertEquals(str(archive), "x 2014-10-19 Complete\nx 2014-10-20 Another one complete") self.assertEqual(str(archive), "x 2014-10-19 Complete\nx 2014-10-20 Another one complete")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
......
test/ConfigTest.py
View file @ 7104428d
...@@ -21,7 +21,7 @@ from test.TopydoTest import TopydoTest ...@@ -21,7 +21,7 @@ from test.TopydoTest import TopydoTest
class ConfigTest(TopydoTest): class ConfigTest(TopydoTest):
def test_config1(self): def test_config1(self):
self.assertEquals(config("test/data/config1").default_command(), 'do') self.assertEqual(config("test/data/config1").default_command(), 'do')
def test_config2(self): def test_config2(self):
self.assertNotEquals(config("").default_command(), 'do') self.assertNotEquals(config("").default_command(), 'do')
......
test/DeleteCommandTest.py
View file @ 7104428d
...@@ -43,70 +43,70 @@ class DeleteCommandTest(CommandTest): ...@@ -43,70 +43,70 @@ class DeleteCommandTest(CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).source(), "Bar") self.assertEqual(self.todolist.todo(1).source(), "Bar")
self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n") self.assertEqual(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_del1_regex(self): def test_del1_regex(self):
command = DeleteCommand(["Foo"], self.todolist, self.out, self.error, _no_prompt) command = DeleteCommand(["Foo"], self.todolist, self.out, self.error, _no_prompt)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).source(), "Bar") self.assertEqual(self.todolist.todo(1).source(), "Bar")
self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n") self.assertEqual(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_del2(self): def test_del2(self):
command = DeleteCommand(["1"], self.todolist, self.out, self.error, _yes_prompt) command = DeleteCommand(["1"], self.todolist, self.out, self.error, _yes_prompt)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.count(), 0) self.assertEqual(self.todolist.count(), 0)
self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Bar\nRemoved: Foo\n") self.assertEqual(self.output, "| 2| Bar p:1\nRemoved: Bar\nRemoved: Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_del3(self): def test_del3(self):
command = DeleteCommand(["-f", "1"], self.todolist, self.out, self.error, _yes_prompt) command = DeleteCommand(["-f", "1"], self.todolist, self.out, self.error, _yes_prompt)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.count(), 1) # force won't delete subtasks self.assertEqual(self.todolist.count(), 1) # force won't delete subtasks
self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n") self.assertEqual(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_del4(self): def test_del4(self):
command = DeleteCommand(["--force", "1"], self.todolist, self.out, self.error, _yes_prompt) command = DeleteCommand(["--force", "1"], self.todolist, self.out, self.error, _yes_prompt)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.count(), 1) # force won't delete subtasks self.assertEqual(self.todolist.count(), 1) # force won't delete subtasks
self.assertEquals(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n") self.assertEqual(self.output, "| 2| Bar p:1\nRemoved: Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_del5(self): def test_del5(self):
command = DeleteCommand(["2"], self.todolist, self.out, self.error) command = DeleteCommand(["2"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).source(), "Foo") self.assertEqual(self.todolist.todo(1).source(), "Foo")
self.assertEquals(self.output, "Removed: Bar p:1\nThe following todo item(s) became active:\n| 1| Foo\n") self.assertEqual(self.output, "Removed: Bar p:1\nThe following todo item(s) became active:\n| 1| Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_del7(self): def test_del7(self):
command = DeleteCommand(["99"], self.todolist, self.out, self.error) command = DeleteCommand(["99"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_del8(self): def test_del8(self):
command = DeleteCommand(["A"], self.todolist, self.out, self.error) command = DeleteCommand(["A"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_del9(self): def test_del9(self):
""" Test deletion with textual IDs. """ """ Test deletion with textual IDs. """
...@@ -115,7 +115,7 @@ class DeleteCommandTest(CommandTest): ...@@ -115,7 +115,7 @@ class DeleteCommandTest(CommandTest):
command = DeleteCommand(["8to"], self.todolist, self.out, self.error) command = DeleteCommand(["8to"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(str(self.todolist), "Foo") self.assertEqual(str(self.todolist), "Foo")
self.assertRaises(InvalidTodoException, self.todolist.todo, 'b0n') self.assertRaises(InvalidTodoException, self.todolist.todo, 'b0n')
def test_multi_del1(self): def test_multi_del1(self):
...@@ -123,14 +123,14 @@ class DeleteCommandTest(CommandTest): ...@@ -123,14 +123,14 @@ class DeleteCommandTest(CommandTest):
command = DeleteCommand(["1", "2"], self.todolist, self.out, self.error, _no_prompt) command = DeleteCommand(["1", "2"], self.todolist, self.out, self.error, _no_prompt)
command.execute() command.execute()
self.assertEquals(self.todolist.count(), 0) self.assertEqual(self.todolist.count(), 0)
def test_multi_del2(self): def test_multi_del2(self):
""" Test deletion of multiple items. """ """ Test deletion of multiple items. """
command = DeleteCommand(["1", "2"], self.todolist, self.out, self.error, _yes_prompt) command = DeleteCommand(["1", "2"], self.todolist, self.out, self.error, _yes_prompt)
command.execute() command.execute()
self.assertEquals(self.todolist.count(), 0) self.assertEqual(self.todolist.count(), 0)
def test_multi_del3(self): def test_multi_del3(self):
""" Fail if any of supplied todo numbers is invalid. """ """ Fail if any of supplied todo numbers is invalid. """
...@@ -138,8 +138,8 @@ class DeleteCommandTest(CommandTest): ...@@ -138,8 +138,8 @@ class DeleteCommandTest(CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given: 99.\n") self.assertEqual(self.errors, "Invalid todo number given: 99.\n")
def test_multi_del4(self): def test_multi_del4(self):
""" Check output when all supplied todo numbers are invalid. """ """ Check output when all supplied todo numbers are invalid. """
...@@ -147,8 +147,8 @@ class DeleteCommandTest(CommandTest): ...@@ -147,8 +147,8 @@ class DeleteCommandTest(CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given: 99.\nInvalid todo number given: A.\n") self.assertEqual(self.errors, "Invalid todo number given: 99.\nInvalid todo number given: A.\n")
def test_empty(self): def test_empty(self):
command = DeleteCommand([], self.todolist, self.out, self.error) command = DeleteCommand([], self.todolist, self.out, self.error)
...@@ -156,14 +156,14 @@ class DeleteCommandTest(CommandTest): ...@@ -156,14 +156,14 @@ class DeleteCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_help(self): def test_help(self):
command = DeleteCommand(["help"], self.todolist, self.out, self.error) command = DeleteCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/DepCommandTest.py
View file @ 7104428d
...@@ -40,8 +40,8 @@ class DepCommandTest(CommandTest): ...@@ -40,8 +40,8 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(4).has_tag('p', '1')) self.assertTrue(self.todolist.todo(4).has_tag('p', '1'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_add2(self): def test_add2(self):
command = DepCommand(["add", "1", "4"], self.todolist, self.out, self.error) command = DepCommand(["add", "1", "4"], self.todolist, self.out, self.error)
...@@ -49,32 +49,32 @@ class DepCommandTest(CommandTest): ...@@ -49,32 +49,32 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(4).has_tag('p', '1')) self.assertTrue(self.todolist.todo(4).has_tag('p', '1'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_add3(self): def test_add3(self):
command = DepCommand(["add", "99", "3"], self.todolist, self.out, self.error) command = DepCommand(["add", "99", "3"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_add4(self): def test_add4(self):
command = DepCommand(["add", "A", "3"], self.todolist, self.out, self.error) command = DepCommand(["add", "A", "3"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_add5(self): def test_add5(self):
command = DepCommand(["add", "1"], self.todolist, self.out, self.error) command = DepCommand(["add", "1"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_add6(self): def test_add6(self):
command = DepCommand(["add", "1", "after", "4"], self.todolist, self.out, self.error) command = DepCommand(["add", "1", "after", "4"], self.todolist, self.out, self.error)
...@@ -82,8 +82,8 @@ class DepCommandTest(CommandTest): ...@@ -82,8 +82,8 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(4).has_tag('p', '1')) self.assertTrue(self.todolist.todo(4).has_tag('p', '1'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_add7(self): def test_add7(self):
command = DepCommand(["add", "1", "before", "4"], self.todolist, self.out, self.error) command = DepCommand(["add", "1", "before", "4"], self.todolist, self.out, self.error)
...@@ -91,8 +91,8 @@ class DepCommandTest(CommandTest): ...@@ -91,8 +91,8 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(1).has_tag('p', '2')) self.assertTrue(self.todolist.todo(1).has_tag('p', '2'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_add8(self): def test_add8(self):
command = DepCommand(["add", "1", "partof", "4"], self.todolist, self.out, self.error) command = DepCommand(["add", "1", "partof", "4"], self.todolist, self.out, self.error)
...@@ -100,8 +100,8 @@ class DepCommandTest(CommandTest): ...@@ -100,8 +100,8 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(1).has_tag('p', '2')) self.assertTrue(self.todolist.todo(1).has_tag('p', '2'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_add9(self): def test_add9(self):
command = DepCommand(["add", "Foo", "to", "4"], self.todolist, self.out, self.error) command = DepCommand(["add", "Foo", "to", "4"], self.todolist, self.out, self.error)
...@@ -109,8 +109,8 @@ class DepCommandTest(CommandTest): ...@@ -109,8 +109,8 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(4).has_tag('p', '1')) self.assertTrue(self.todolist.todo(4).has_tag('p', '1'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def rm_helper(self, p_args): def rm_helper(self, p_args):
""" """
...@@ -124,8 +124,8 @@ class DepCommandTest(CommandTest): ...@@ -124,8 +124,8 @@ class DepCommandTest(CommandTest):
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertTrue(self.todolist.todo(1).has_tag('id', '1')) self.assertTrue(self.todolist.todo(1).has_tag('id', '1'))
self.assertFalse(self.todolist.todo(3).has_tag('p', '1')) self.assertFalse(self.todolist.todo(3).has_tag('p', '1'))
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_rm1(self): def test_rm1(self):
self.rm_helper(["rm", "1", "to", "3"]) self.rm_helper(["rm", "1", "to", "3"])
...@@ -144,64 +144,64 @@ class DepCommandTest(CommandTest): ...@@ -144,64 +144,64 @@ class DepCommandTest(CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_rm4(self): def test_rm4(self):
command = DepCommand(["rm", "A", "3"], self.todolist, self.out, self.error) command = DepCommand(["rm", "A", "3"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_rm5(self): def test_rm5(self):
command = DepCommand(["rm", "1"], self.todolist, self.out, self.error) command = DepCommand(["rm", "1"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_ls1(self): def test_ls1(self):
command = DepCommand(["ls", "1", "to"], self.todolist, self.out, self.error) command = DepCommand(["ls", "1", "to"], self.todolist, self.out, self.error)
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.assertEqual(self.output, "| 2| Bar p:1\n| 3| Baz p:1\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_ls2(self): def test_ls2(self):
command = DepCommand(["ls", "99", "to"], self.todolist, self.out, self.error) command = DepCommand(["ls", "99", "to"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_ls3(self): def test_ls3(self):
command = DepCommand(["ls", "to", "3"], self.todolist, self.out, self.error) command = DepCommand(["ls", "to", "3"], self.todolist, self.out, self.error)
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.assertEqual(self.output, "| 1| Foo id:1\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_ls4(self): def test_ls4(self):
command = DepCommand(["ls", "to", "99"], self.todolist, self.out, self.error) command = DepCommand(["ls", "to", "99"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_ls5(self): def test_ls5(self):
command = DepCommand(["ls", "1"], self.todolist, self.out, self.error) command = DepCommand(["ls", "1"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_ls6(self): def test_ls6(self):
command = DepCommand(["ls"], self.todolist, self.out, self.error) command = DepCommand(["ls"], self.todolist, self.out, self.error)
...@@ -209,7 +209,7 @@ class DepCommandTest(CommandTest): ...@@ -209,7 +209,7 @@ class DepCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def gc_helper(self, p_subcommand): def gc_helper(self, p_subcommand):
command = DepCommand([p_subcommand], self.todolist, self.out, self.error) command = DepCommand([p_subcommand], self.todolist, self.out, self.error)
...@@ -246,8 +246,8 @@ class DepCommandTest(CommandTest): ...@@ -246,8 +246,8 @@ class DepCommandTest(CommandTest):
command = DepCommand(["help"], self.todolist, self.out, self.error) command = DepCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/DepriCommandTest.py
View file @ 7104428d
...@@ -36,37 +36,37 @@ class DepriCommandTest(CommandTest): ...@@ -36,37 +36,37 @@ class DepriCommandTest(CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).priority(), None) self.assertEqual(self.todolist.todo(1).priority(), None)
self.assertEquals(self.output, "Priority removed.\n| 1| Foo\n") self.assertEqual(self.output, "Priority removed.\n| 1| Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_depri2(self): def test_depri2(self):
command = DepriCommand(["2"], self.todolist, self.out, self.error) command = DepriCommand(["2"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(2).priority(), None) self.assertEqual(self.todolist.todo(2).priority(), None)
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_depri3(self): def test_depri3(self):
command = DepriCommand(["Foo"], self.todolist, self.out, self.error) command = DepriCommand(["Foo"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).priority(), None) self.assertEqual(self.todolist.todo(1).priority(), None)
self.assertEquals(self.output, "Priority removed.\n| 1| Foo\n") self.assertEqual(self.output, "Priority removed.\n| 1| Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_depri4(self): def test_depri4(self):
command = DepriCommand(["1","Baz"], self.todolist, self.out, self.error) command = DepriCommand(["1","Baz"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.todolist.todo(1).priority(), None) self.assertEqual(self.todolist.todo(1).priority(), None)
self.assertEquals(self.todolist.todo(3).priority(), None) self.assertEqual(self.todolist.todo(3).priority(), None)
self.assertEquals(self.output, "Priority removed.\n| 1| Foo\nPriority removed.\n| 3| Baz\n") self.assertEqual(self.output, "Priority removed.\n| 1| Foo\nPriority removed.\n| 3| Baz\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_invalid1(self): def test_invalid1(self):
...@@ -75,7 +75,7 @@ class DepriCommandTest(CommandTest): ...@@ -75,7 +75,7 @@ class DepriCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_invalid2(self): def test_invalid2(self):
command = DepriCommand(["99", "1"], self.todolist, self.out, self.error) command = DepriCommand(["99", "1"], self.todolist, self.out, self.error)
...@@ -83,7 +83,7 @@ class DepriCommandTest(CommandTest): ...@@ -83,7 +83,7 @@ class DepriCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid todo number given: 99.\n") self.assertEqual(self.errors, "Invalid todo number given: 99.\n")
def test_invalid3(self): def test_invalid3(self):
command = DepriCommand(["99", "FooBar"], self.todolist, self.out, self.error) command = DepriCommand(["99", "FooBar"], self.todolist, self.out, self.error)
...@@ -91,7 +91,7 @@ class DepriCommandTest(CommandTest): ...@@ -91,7 +91,7 @@ class DepriCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid todo number given: 99.\nInvalid todo number given: FooBar.\n") self.assertEqual(self.errors, "Invalid todo number given: 99.\nInvalid todo number given: FooBar.\n")
def test_empty(self): def test_empty(self):
command = DepriCommand([], self.todolist, self.out, self.error) command = DepriCommand([], self.todolist, self.out, self.error)
...@@ -99,14 +99,14 @@ class DepriCommandTest(CommandTest): ...@@ -99,14 +99,14 @@ class DepriCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_help(self): def test_help(self):
command = DepriCommand(["help"], self.todolist, self.out, self.error) command = DepriCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/DoCommandTest.py
View file @ 7104428d
This diff is collapsed.
test/EditCommandTest.py
View file @ 7104428d
...@@ -43,8 +43,8 @@ class EditCommandTest(CommandTest): ...@@ -43,8 +43,8 @@ class EditCommandTest(CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
self.assertEquals(str(self.todolist), "Bar p:1 @test\nBaz @test\nFoo id:1") self.assertEqual(str(self.todolist), "Bar p:1 @test\nBaz @test\nFoo id:1")
@mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp') @mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp')
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor')
...@@ -57,8 +57,8 @@ class EditCommandTest(CommandTest): ...@@ -57,8 +57,8 @@ class EditCommandTest(CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
self.assertEquals(str(self.todolist), "Foo id:1\nBaz @test\nLazy Cat") self.assertEqual(str(self.todolist), "Foo id:1\nBaz @test\nLazy Cat")
def test_edit3(self): def test_edit3(self):
""" Throw an error after invalid todo number given as argument. """ """ Throw an error after invalid todo number given as argument. """
...@@ -66,7 +66,7 @@ class EditCommandTest(CommandTest): ...@@ -66,7 +66,7 @@ class EditCommandTest(CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_edit4(self): def test_edit4(self):
""" Throw an error with pointing invalid argument. """ """ Throw an error with pointing invalid argument. """
...@@ -74,7 +74,7 @@ class EditCommandTest(CommandTest): ...@@ -74,7 +74,7 @@ class EditCommandTest(CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.errors, "Invalid todo number given: 4.\n") self.assertEqual(self.errors, "Invalid todo number given: 4.\n")
@mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp') @mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp')
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor')
...@@ -87,8 +87,8 @@ class EditCommandTest(CommandTest): ...@@ -87,8 +87,8 @@ class EditCommandTest(CommandTest):
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.errors, "Number of edited todos is not equal to number of supplied todo IDs.\n") self.assertEqual(self.errors, "Number of edited todos is not equal to number of supplied todo IDs.\n")
self.assertEquals(str(self.todolist), "Foo id:1\nBar p:1 @test\nBaz @test") self.assertEqual(str(self.todolist), "Foo id:1\nBar p:1 @test\nBaz @test")
@mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp') @mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp')
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor')
...@@ -101,8 +101,8 @@ class EditCommandTest(CommandTest): ...@@ -101,8 +101,8 @@ class EditCommandTest(CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
self.assertEquals(str(self.todolist), "Foo id:1\nLazy Cat\nLazy Dog") self.assertEqual(str(self.todolist), "Foo id:1\nLazy Cat\nLazy Dog")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/FilterTest.py
View file @ 7104428d
This diff is collapsed.
test/GraphTest.py
View file @ 7104428d
...@@ -51,34 +51,34 @@ class GraphTest(TopydoTest): ...@@ -51,34 +51,34 @@ class GraphTest(TopydoTest):
self.assertFalse(self.graph.has_edge_id("1")) self.assertFalse(self.graph.has_edge_id("1"))
def test_incoming_neighbors1(self): def test_incoming_neighbors1(self):
self.assertEquals(self.graph.incoming_neighbors(1), set()) self.assertEqual(self.graph.incoming_neighbors(1), set())
def test_edge_id_of_nonexistent_edge(self): def test_edge_id_of_nonexistent_edge(self):
self.assertFalse(self.graph.edge_id(1, 6)) self.assertFalse(self.graph.edge_id(1, 6))
def test_incoming_neighbors2(self): def test_incoming_neighbors2(self):
self.assertEquals(self.graph.incoming_neighbors(2), set([1, 6])) self.assertEqual(self.graph.incoming_neighbors(2), set([1, 6]))
def test_incoming_neighbors3(self): def test_incoming_neighbors3(self):
self.assertEquals(self.graph.incoming_neighbors(1, True), set()) self.assertEqual(self.graph.incoming_neighbors(1, True), set())
def test_incoming_neighbors4(self): def test_incoming_neighbors4(self):
self.assertEquals(self.graph.incoming_neighbors(5, True), set([1, 2, 3, 4, 6])) self.assertEqual(self.graph.incoming_neighbors(5, True), set([1, 2, 3, 4, 6]))
def test_outgoing_neighbors1(self): def test_outgoing_neighbors1(self):
self.assertEquals(self.graph.outgoing_neighbors(1), set([2, 3])) self.assertEqual(self.graph.outgoing_neighbors(1), set([2, 3]))
def test_outgoing_neighbors2(self): def test_outgoing_neighbors2(self):
self.assertEquals(self.graph.outgoing_neighbors(2), set([4])) self.assertEqual(self.graph.outgoing_neighbors(2), set([4]))
def test_outgoing_neighbors3(self): def test_outgoing_neighbors3(self):
self.assertEquals(self.graph.outgoing_neighbors(1, True), set([2, 3, 4, 5, 6])) self.assertEqual(self.graph.outgoing_neighbors(1, True), set([2, 3, 4, 5, 6]))
def test_outgoing_neighbors4(self): def test_outgoing_neighbors4(self):
self.assertEquals(self.graph.outgoing_neighbors(3), set([5])) self.assertEqual(self.graph.outgoing_neighbors(3), set([5]))
def test_outgoing_neighbors5(self): def test_outgoing_neighbors5(self):
self.assertEquals(self.graph.outgoing_neighbors(5), set([])) self.assertEqual(self.graph.outgoing_neighbors(5), set([]))
def test_remove_edge1(self): def test_remove_edge1(self):
self.graph.remove_edge(1, 2) self.graph.remove_edge(1, 2)
...@@ -165,11 +165,11 @@ class GraphTest(TopydoTest): ...@@ -165,11 +165,11 @@ class GraphTest(TopydoTest):
def test_str_output(self): def test_str_output(self):
out = 'digraph g {\n 1\n 1 -> 2 [label="1"]\n 1 -> 3\n 2\n 2 -> 4 [label="Test"]\n 3\n 3 -> 5\n 4\n 4 -> 3\n 4 -> 6\n 5\n 6\n 6 -> 2\n}\n' out = 'digraph g {\n 1\n 1 -> 2 [label="1"]\n 1 -> 3\n 2\n 2 -> 4 [label="Test"]\n 3\n 3 -> 5\n 4\n 4 -> 3\n 4 -> 6\n 5\n 6\n 6 -> 2\n}\n'
self.assertEquals(str(self.graph), out) self.assertEqual(str(self.graph), out)
def test_dot_output_without_labels(self): def test_dot_output_without_labels(self):
out = 'digraph g {\n 1\n 1 -> 2\n 1 -> 3\n 2\n 2 -> 4\n 3\n 3 -> 5\n 4\n 4 -> 3\n 4 -> 6\n 5\n 6\n 6 -> 2\n}\n' out = 'digraph g {\n 1\n 1 -> 2\n 1 -> 3\n 2\n 2 -> 4\n 3\n 3 -> 5\n 4\n 4 -> 3\n 4 -> 6\n 5\n 6\n 6 -> 2\n}\n'
self.assertEquals(self.graph.dot(False), out) self.assertEqual(self.graph.dot(False), out)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/IcalCommandTest.py
View file @ 7104428d
...@@ -44,15 +44,15 @@ class IcalCommandTest(CommandTest): ...@@ -44,15 +44,15 @@ class IcalCommandTest(CommandTest):
with open('test/data/ListCommandTest.ics', 'r') as ical: with open('test/data/ListCommandTest.ics', 'r') as ical:
icaltext = "".join(ical.readlines()) icaltext = "".join(ical.readlines())
self.assertEquals(replace_ical_tags(self.output), replace_ical_tags(icaltext)) self.assertEqual(replace_ical_tags(self.output), replace_ical_tags(icaltext))
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_help(self): def test_help(self):
command = IcalCommand(["help"], self.todolist, self.out, self.error) command = IcalCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/ListCommandTest.py
View file @ 7104428d
This diff is collapsed.
test/ListContextCommandTest.py
View file @ 7104428d
...@@ -26,7 +26,7 @@ class ListContextCommandTest(CommandTest): ...@@ -26,7 +26,7 @@ class ListContextCommandTest(CommandTest):
command = ListContextCommand([""], todolist, self.out, self.error) command = ListContextCommand([""], todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output,"Context1\nContext2\n") self.assertEqual(self.output,"Context1\nContext2\n")
self.assertFalse(self.errors) self.assertFalse(self.errors)
def test_contexts2(self): def test_contexts2(self):
...@@ -34,15 +34,15 @@ class ListContextCommandTest(CommandTest): ...@@ -34,15 +34,15 @@ class ListContextCommandTest(CommandTest):
command = ListContextCommand(["aaa"], todolist, self.out, self.error) command = ListContextCommand(["aaa"], todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output,"Context1\nContext2\n") self.assertEqual(self.output,"Context1\nContext2\n")
self.assertFalse(self.errors) self.assertFalse(self.errors)
def test_help(self): def test_help(self):
command = ListContextCommand(["help"], None, self.out, self.error) command = ListContextCommand(["help"], None, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/ListProjectCommandTest.py
View file @ 7104428d
...@@ -26,7 +26,7 @@ class ListProjectCommandTest(CommandTest): ...@@ -26,7 +26,7 @@ class ListProjectCommandTest(CommandTest):
command = ListProjectCommand([""], todolist, self.out, self.error) command = ListProjectCommand([""], todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "Project1\nProject2\n") self.assertEqual(self.output, "Project1\nProject2\n")
self.assertFalse(self.errors) self.assertFalse(self.errors)
def test_projects2(self): def test_projects2(self):
...@@ -34,15 +34,15 @@ class ListProjectCommandTest(CommandTest): ...@@ -34,15 +34,15 @@ class ListProjectCommandTest(CommandTest):
command = ListProjectCommand(["aaa"], todolist, self.out, self.error) command = ListProjectCommand(["aaa"], todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "Project1\nProject2\n") self.assertEqual(self.output, "Project1\nProject2\n")
self.assertFalse(self.errors) self.assertFalse(self.errors)
def test_help(self): def test_help(self):
command = ListProjectCommand(["help"], None, self.out, self.error) command = ListProjectCommand(["help"], None, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/PostponeCommandTest.py
View file @ 7104428d
This diff is collapsed.
test/PriorityCommandTest.py
View file @ 7104428d
...@@ -35,40 +35,40 @@ class PriorityCommandTest(CommandTest): ...@@ -35,40 +35,40 @@ class PriorityCommandTest(CommandTest):
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, "Priority changed from A to B\n| 1| (B) Foo\n") self.assertEqual(self.output, "Priority changed from A to B\n| 1| (B) Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_set_prio2(self): def test_set_prio2(self):
command = PriorityCommand(["2", "Z"], self.todolist, self.out, self.error) command = PriorityCommand(["2", "Z"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, "Priority set to Z.\n| 2| (Z) Bar\n") self.assertEqual(self.output, "Priority set to Z.\n| 2| (Z) Bar\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_set_prio3(self): def test_set_prio3(self):
command = PriorityCommand(["Foo", "B"], self.todolist, self.out, self.error) command = PriorityCommand(["Foo", "B"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, "Priority changed from A to B\n| 1| (B) Foo\n") self.assertEqual(self.output, "Priority changed from A to B\n| 1| (B) Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_set_prio4(self): def test_set_prio4(self):
command = PriorityCommand(["1", "A"], self.todolist, self.out, self.error) command = PriorityCommand(["1", "A"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.output, "| 1| (A) Foo\n") self.assertEqual(self.output, "| 1| (A) Foo\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_set_prio5(self): def test_set_prio5(self):
command = PriorityCommand(["Foo", "2", "C"], self.todolist, self.out, self.error) command = PriorityCommand(["Foo", "2", "C"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertEquals(self.output, "Priority changed from A to C\n| 1| (C) Foo\nPriority set to C.\n| 2| (C) Bar\n") self.assertEqual(self.output, "Priority changed from A to C\n| 1| (C) Foo\nPriority set to C.\n| 2| (C) Bar\n")
self.assertEquals(self.errors, "") self.assertEqual(self.errors, "")
def test_invalid1(self): def test_invalid1(self):
command = PriorityCommand(["99", "A"], self.todolist, self.out, self.error) command = PriorityCommand(["99", "A"], self.todolist, self.out, self.error)
...@@ -76,7 +76,7 @@ class PriorityCommandTest(CommandTest): ...@@ -76,7 +76,7 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid todo number given.\n") self.assertEqual(self.errors, "Invalid todo number given.\n")
def test_invalid2(self): def test_invalid2(self):
command = PriorityCommand(["1", "99", "A"], self.todolist, self.out, self.error) command = PriorityCommand(["1", "99", "A"], self.todolist, self.out, self.error)
...@@ -84,7 +84,7 @@ class PriorityCommandTest(CommandTest): ...@@ -84,7 +84,7 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid todo number given: 99.\n") self.assertEqual(self.errors, "Invalid todo number given: 99.\n")
def test_invalid3(self): def test_invalid3(self):
command = PriorityCommand(["98", "99", "A"], self.todolist, self.out, self.error) command = PriorityCommand(["98", "99", "A"], self.todolist, self.out, self.error)
...@@ -92,7 +92,7 @@ class PriorityCommandTest(CommandTest): ...@@ -92,7 +92,7 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid todo number given: 98.\nInvalid todo number given: 99.\n") self.assertEqual(self.errors, "Invalid todo number given: 98.\nInvalid todo number given: 99.\n")
def test_invalid4(self): def test_invalid4(self):
command = PriorityCommand(["1", "ZZ"], self.todolist, self.out, self.error) command = PriorityCommand(["1", "ZZ"], self.todolist, self.out, self.error)
...@@ -100,7 +100,7 @@ class PriorityCommandTest(CommandTest): ...@@ -100,7 +100,7 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, "Invalid priority given.\n") self.assertEqual(self.errors, "Invalid priority given.\n")
def test_invalid5(self): def test_invalid5(self):
command = PriorityCommand(["A"], self.todolist, self.out, self.error) command = PriorityCommand(["A"], self.todolist, self.out, self.error)
...@@ -108,7 +108,7 @@ class PriorityCommandTest(CommandTest): ...@@ -108,7 +108,7 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_invalid6(self): def test_invalid6(self):
command = PriorityCommand(["1"], self.todolist, self.out, self.error) command = PriorityCommand(["1"], self.todolist, self.out, self.error)
...@@ -116,7 +116,7 @@ class PriorityCommandTest(CommandTest): ...@@ -116,7 +116,7 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_empty(self): def test_empty(self):
command = PriorityCommand([], self.todolist, self.out, self.error) command = PriorityCommand([], self.todolist, self.out, self.error)
...@@ -124,14 +124,14 @@ class PriorityCommandTest(CommandTest): ...@@ -124,14 +124,14 @@ class PriorityCommandTest(CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertFalse(self.output) self.assertFalse(self.output)
self.assertEquals(self.errors, command.usage() + "\n") self.assertEqual(self.errors, command.usage() + "\n")
def test_help(self): def test_help(self):
command = PriorityCommand(["help"], self.todolist, self.out, self.error) command = PriorityCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/RecurrenceTest.py
View file @ 7104428d
...@@ -35,7 +35,7 @@ class RecurrenceTest(TopydoTest): ...@@ -35,7 +35,7 @@ class RecurrenceTest(TopydoTest):
self.todo.set_tag(config().tag_due(), future.isoformat()) self.todo.set_tag(config().tag_due(), future.isoformat())
new_todo = advance_recurring_todo(self.todo) new_todo = advance_recurring_todo(self.todo)
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_duedate2(self): def test_duedate2(self):
""" Where due date is today. """ """ Where due date is today. """
...@@ -45,7 +45,7 @@ class RecurrenceTest(TopydoTest): ...@@ -45,7 +45,7 @@ class RecurrenceTest(TopydoTest):
self.todo.set_tag(config().tag_due(), today.isoformat()) self.todo.set_tag(config().tag_due(), today.isoformat())
new_todo = advance_recurring_todo(self.todo) new_todo = advance_recurring_todo(self.todo)
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_duedate3(self): def test_duedate3(self):
""" Where due date is in the past. """ """ Where due date is in the past. """
...@@ -55,7 +55,7 @@ class RecurrenceTest(TopydoTest): ...@@ -55,7 +55,7 @@ class RecurrenceTest(TopydoTest):
self.todo.set_tag(config().tag_due(), past.isoformat()) self.todo.set_tag(config().tag_due(), past.isoformat())
new_todo = advance_recurring_todo(self.todo) new_todo = advance_recurring_todo(self.todo)
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_duedate4(self): def test_duedate4(self):
""" Where due date is in the past. """ """ Where due date is in the past. """
...@@ -65,7 +65,7 @@ class RecurrenceTest(TopydoTest): ...@@ -65,7 +65,7 @@ class RecurrenceTest(TopydoTest):
self.todo.set_tag(config().tag_due(), past.isoformat()) self.todo.set_tag(config().tag_due(), past.isoformat())
new_todo = strict_advance_recurring_todo(self.todo) new_todo = strict_advance_recurring_todo(self.todo)
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_duedate5(self): def test_duedate5(self):
""" Where due date is in the future. """ """ Where due date is in the future. """
...@@ -75,7 +75,7 @@ class RecurrenceTest(TopydoTest): ...@@ -75,7 +75,7 @@ class RecurrenceTest(TopydoTest):
self.todo.set_tag(config().tag_due(), future.isoformat()) self.todo.set_tag(config().tag_due(), future.isoformat())
new_todo = strict_advance_recurring_todo(self.todo) new_todo = strict_advance_recurring_todo(self.todo)
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_duedate6(self): def test_duedate6(self):
""" Where due date is today. """ """ Where due date is today. """
...@@ -85,21 +85,21 @@ class RecurrenceTest(TopydoTest): ...@@ -85,21 +85,21 @@ class RecurrenceTest(TopydoTest):
self.todo.set_tag(config().tag_due(), today.isoformat()) self.todo.set_tag(config().tag_due(), today.isoformat())
new_todo = strict_advance_recurring_todo(self.todo) new_todo = strict_advance_recurring_todo(self.todo)
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_noduedate1(self): def test_noduedate1(self):
new_due = date.today() + timedelta(7) new_due = date.today() + timedelta(7)
new_todo = advance_recurring_todo(self.todo) new_todo = advance_recurring_todo(self.todo)
self.assertTrue(new_todo.has_tag(config().tag_due())) self.assertTrue(new_todo.has_tag(config().tag_due()))
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_noduedate2(self): def test_noduedate2(self):
new_due = date.today() + timedelta(7) new_due = date.today() + timedelta(7)
new_todo = strict_advance_recurring_todo(self.todo) new_todo = strict_advance_recurring_todo(self.todo)
self.assertTrue(new_todo.has_tag(config().tag_due())) self.assertTrue(new_todo.has_tag(config().tag_due()))
self.assertEquals(new_todo.due_date(), new_due) self.assertEqual(new_todo.due_date(), new_due)
def test_startdate1(self): def test_startdate1(self):
""" Start date is before due date. """ """ Start date is before due date. """
...@@ -110,7 +110,7 @@ class RecurrenceTest(TopydoTest): ...@@ -110,7 +110,7 @@ class RecurrenceTest(TopydoTest):
new_start = date.today() + timedelta(6) new_start = date.today() + timedelta(6)
new_todo = advance_recurring_todo(self.todo) new_todo = advance_recurring_todo(self.todo)
self.assertEquals(new_todo.start_date(), new_start) self.assertEqual(new_todo.start_date(), new_start)
def test_startdate2(self): def test_startdate2(self):
""" Strict recurrence. Start date is before due date. """ """ Strict recurrence. Start date is before due date. """
...@@ -122,7 +122,7 @@ class RecurrenceTest(TopydoTest): ...@@ -122,7 +122,7 @@ class RecurrenceTest(TopydoTest):
new_start = date.today() + timedelta(5) new_start = date.today() + timedelta(5)
new_todo = strict_advance_recurring_todo(self.todo) new_todo = strict_advance_recurring_todo(self.todo)
self.assertEquals(new_todo.start_date(), new_start) self.assertEqual(new_todo.start_date(), new_start)
def test_startdate3(self): def test_startdate3(self):
""" Start date equals due date. """ """ Start date equals due date. """
...@@ -132,7 +132,7 @@ class RecurrenceTest(TopydoTest): ...@@ -132,7 +132,7 @@ class RecurrenceTest(TopydoTest):
new_start = date.today() + timedelta(7) new_start = date.today() + timedelta(7)
new_todo = advance_recurring_todo(self.todo) new_todo = advance_recurring_todo(self.todo)
self.assertEquals(new_todo.start_date(), new_start) self.assertEqual(new_todo.start_date(), new_start)
def test_no_recurrence(self): def test_no_recurrence(self):
self.todo.remove_tag('rec') self.todo.remove_tag('rec')
......
test/RelativeDateTest.py
View file @ 7104428d
...@@ -32,20 +32,20 @@ class RelativeDateTester(TopydoTest): ...@@ -32,20 +32,20 @@ class RelativeDateTester(TopydoTest):
def test_zero_days(self): def test_zero_days(self):
result = relative_date_to_date('0d') result = relative_date_to_date('0d')
self.assertEquals(result, self.today) self.assertEqual(result, self.today)
def test_one_day(self): def test_one_day(self):
result = relative_date_to_date('1d') result = relative_date_to_date('1d')
self.assertEquals(result, self.tomorrow) self.assertEqual(result, self.tomorrow)
def test_one_week(self): def test_one_week(self):
result = relative_date_to_date('1w') result = relative_date_to_date('1w')
self.assertEquals(result, date.today() + timedelta(weeks=1)) self.assertEqual(result, date.today() + timedelta(weeks=1))
def test_one_month(self): def test_one_month(self):
test_date = date(2015, 1, 10) test_date = date(2015, 1, 10)
result = relative_date_to_date('1m', test_date) result = relative_date_to_date('1m', test_date)
self.assertEquals(result, date(2015, 2, 10)) self.assertEqual(result, date(2015, 2, 10))
def test_one_month_ext(self): def test_one_month_ext(self):
test_date1 = date(2015, 1, 29) test_date1 = date(2015, 1, 29)
...@@ -60,31 +60,31 @@ class RelativeDateTester(TopydoTest): ...@@ -60,31 +60,31 @@ class RelativeDateTester(TopydoTest):
result4 = relative_date_to_date('1m', test_date4) result4 = relative_date_to_date('1m', test_date4)
result5 = relative_date_to_date('1m', test_date5) result5 = relative_date_to_date('1m', test_date5)
self.assertEquals(result1, date(2015, 2, 28)) self.assertEqual(result1, date(2015, 2, 28))
self.assertEquals(result2, date(2016, 2, 29)) self.assertEqual(result2, date(2016, 2, 29))
self.assertEquals(result3, date(2016, 1, 31)) self.assertEqual(result3, date(2016, 1, 31))
self.assertEquals(result4, date(2015, 8, 31)) self.assertEqual(result4, date(2015, 8, 31))
self.assertEquals(result5, date(2015, 11, 30)) self.assertEqual(result5, date(2015, 11, 30))
def test_one_year(self): def test_one_year(self):
test_date = date(2015, 1, 10) test_date = date(2015, 1, 10)
result = relative_date_to_date('1y', test_date) result = relative_date_to_date('1y', test_date)
self.assertEquals(result, date(2016, 1, 10)) self.assertEqual(result, date(2016, 1, 10))
def test_leap_year(self): def test_leap_year(self):
test_date = date(2016, 2, 29) test_date = date(2016, 2, 29)
result1 = relative_date_to_date('1y', test_date) result1 = relative_date_to_date('1y', test_date)
result2 = relative_date_to_date('4y', test_date) result2 = relative_date_to_date('4y', test_date)
self.assertEquals(result1, date(2017, 2, 28)) self.assertEqual(result1, date(2017, 2, 28))
self.assertEquals(result2, date(2020, 2, 29)) self.assertEqual(result2, date(2020, 2, 29))
def test_zero_months(self): def test_zero_months(self):
result = relative_date_to_date('0m') result = relative_date_to_date('0m')
self.assertEquals(result, self.today) self.assertEqual(result, self.today)
def test_zero_years(self): def test_zero_years(self):
result = relative_date_to_date('0y') result = relative_date_to_date('0y')
self.assertEquals(result, self.today) self.assertEqual(result, self.today)
def test_garbage1(self): def test_garbage1(self):
result = relative_date_to_date('0dd') result = relative_date_to_date('0dd')
...@@ -92,40 +92,40 @@ class RelativeDateTester(TopydoTest): ...@@ -92,40 +92,40 @@ class RelativeDateTester(TopydoTest):
def test_one_day_capital(self): def test_one_day_capital(self):
result = relative_date_to_date('1D') result = relative_date_to_date('1D')
self.assertEquals(result, self.tomorrow) self.assertEqual(result, self.tomorrow)
def test_today1(self): def test_today1(self):
result = relative_date_to_date('today') result = relative_date_to_date('today')
self.assertEquals(result, self.today) self.assertEqual(result, self.today)
def test_today2(self): def test_today2(self):
result = relative_date_to_date('tod') result = relative_date_to_date('tod')
self.assertEquals(result, self.today) self.assertEqual(result, self.today)
def test_today3(self): def test_today3(self):
result = relative_date_to_date('today', \ result = relative_date_to_date('today', \
date.today() + timedelta(1)) date.today() + timedelta(1))
self.assertEquals(result, self.today) self.assertEqual(result, self.today)
def test_tomorrow1(self): def test_tomorrow1(self):
result = relative_date_to_date('Tomorrow') result = relative_date_to_date('Tomorrow')
self.assertEquals(result, self.tomorrow) self.assertEqual(result, self.tomorrow)
def test_tomorrow2(self): def test_tomorrow2(self):
result = relative_date_to_date('tom') result = relative_date_to_date('tom')
self.assertEquals(result, self.tomorrow) self.assertEqual(result, self.tomorrow)
def test_monday1(self): def test_monday1(self):
result = relative_date_to_date('monday') result = relative_date_to_date('monday')
self.assertEquals(result, self.monday) self.assertEqual(result, self.monday)
def test_monday2(self): def test_monday2(self):
result = relative_date_to_date('mo') result = relative_date_to_date('mo')
self.assertEquals(result, self.monday) self.assertEqual(result, self.monday)
def test_monday3(self): def test_monday3(self):
result = relative_date_to_date('mon') result = relative_date_to_date('mon')
self.assertEquals(result, self.monday) self.assertEqual(result, self.monday)
def test_monday4(self): def test_monday4(self):
result = relative_date_to_date('mondayy') result = relative_date_to_date('mondayy')
...@@ -133,11 +133,11 @@ class RelativeDateTester(TopydoTest): ...@@ -133,11 +133,11 @@ class RelativeDateTester(TopydoTest):
def test_offset1(self): def test_offset1(self):
result = relative_date_to_date('1d', self.tomorrow) result = relative_date_to_date('1d', self.tomorrow)
self.assertEquals(result, date.today() + timedelta(2)) self.assertEqual(result, date.today() + timedelta(2))
def test_negative_period1(self): def test_negative_period1(self):
result = relative_date_to_date('-1d') result = relative_date_to_date('-1d')
self.assertEquals(result, date.today() - timedelta(1)) self.assertEqual(result, date.today() - timedelta(1))
def test_negative_period2(self): def test_negative_period2(self):
result = relative_date_to_date('-0d') result = relative_date_to_date('-0d')
......
test/SortCommandTest.py
View file @ 7104428d
...@@ -31,13 +31,13 @@ class SortCommandTest(CommandTest): ...@@ -31,13 +31,13 @@ class SortCommandTest(CommandTest):
command = SortCommand(["text"], self.todolist, self.out, self.error) command = SortCommand(["text"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(str(self.todolist), "First\n(A) Foo\n2014-06-14 Last") self.assertEqual(str(self.todolist), "First\n(A) Foo\n2014-06-14 Last")
def test_sort2(self): def test_sort2(self):
command = SortCommand([], self.todolist, self.out, self.error) command = SortCommand([], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(str(self.todolist), "(A) Foo\n2014-06-14 Last\nFirst") self.assertEqual(str(self.todolist), "(A) Foo\n2014-06-14 Last\nFirst")
def test_sort3(self): def test_sort3(self):
""" Check that order does not influence the UID of a todo. """ """ Check that order does not influence the UID of a todo. """
...@@ -48,14 +48,14 @@ class SortCommandTest(CommandTest): ...@@ -48,14 +48,14 @@ class SortCommandTest(CommandTest):
command.execute() command.execute()
todo2 = self.todolist.todo('7ui') todo2 = self.todolist.todo('7ui')
self.assertEquals(todo1.source(), todo2.source()) self.assertEqual(todo1.source(), todo2.source())
def test_help(self): def test_help(self):
command = SortCommand(["help"], self.todolist, self.out, self.error) command = SortCommand(["help"], self.todolist, self.out, self.error)
command.execute() command.execute()
self.assertEquals(self.output, "") self.assertEqual(self.output, "")
self.assertEquals(self.errors, command.usage() + "\n\n" + command.help() + "\n") self.assertEqual(self.errors, command.usage() + "\n\n" + command.help() + "\n")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/SorterTest.py
View file @ 7104428d
...@@ -33,8 +33,8 @@ class SorterTest(TopydoTest): ...@@ -33,8 +33,8 @@ class SorterTest(TopydoTest):
todos_sorted = todolist_to_string(p_sorter.sort(todos)) todos_sorted = todolist_to_string(p_sorter.sort(todos))
todos_ref = todolist_to_string(load_file(p_filename_ref)) todos_ref = todolist_to_string(load_file(p_filename_ref))
self.assertEquals(todos_sorted, todos_ref) self.assertEqual(todos_sorted, todos_ref)
self.assertEquals(todolist_to_string(todos), text_before) self.assertEqual(todolist_to_string(todos), text_before)
def test_sort1(self): def test_sort1(self):
""" Alphabetically sorted """ """ Alphabetically sorted """
...@@ -128,7 +128,7 @@ class SorterTest(TopydoTest): ...@@ -128,7 +128,7 @@ class SorterTest(TopydoTest):
view = todolist.view(sorter, []) view = todolist.view(sorter, [])
result = load_file('test/data/SorterTest10-result.txt') result = load_file('test/data/SorterTest10-result.txt')
self.assertEquals(str(view), todolist_to_string(result)) self.assertEqual(str(view), todolist_to_string(result))
def test_sort15(self): def test_sort15(self):
""" """
...@@ -141,7 +141,7 @@ class SorterTest(TopydoTest): ...@@ -141,7 +141,7 @@ class SorterTest(TopydoTest):
view = todolist.view(sorter, []) view = todolist.view(sorter, [])
result = load_file('test/data/SorterTest11-result.txt') result = load_file('test/data/SorterTest11-result.txt')
self.assertEquals(str(view), todolist_to_string(result)) self.assertEqual(str(view), todolist_to_string(result))
def test_sort16(self): def test_sort16(self):
""" """
...@@ -153,7 +153,7 @@ class SorterTest(TopydoTest): ...@@ -153,7 +153,7 @@ class SorterTest(TopydoTest):
view = todolist.view(sorter, []) view = todolist.view(sorter, [])
result = load_file('test/data/SorterTest12-result.txt') result = load_file('test/data/SorterTest12-result.txt')
self.assertEquals(str(view), todolist_to_string(result)) self.assertEqual(str(view), todolist_to_string(result))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/TagCommandTest.py
View file @ 7104428d
This diff is collapsed.
test/TodoBaseTest.py
View file @ 7104428d
...@@ -48,7 +48,7 @@ class TodoBaseTester(TopydoTest): ...@@ -48,7 +48,7 @@ class TodoBaseTester(TopydoTest):
todo = TodoBase("(C) Foo id:1") todo = TodoBase("(C) Foo id:1")
todo.add_tag('id', '2') todo.add_tag('id', '2')
self.assertEquals(todo.source(), '(C) Foo id:1 id:2') self.assertEqual(todo.source(), '(C) Foo id:1 id:2')
def test_set_tag1(self): def test_set_tag1(self):
todo = TodoBase("(C) Foo foo:bar") todo = TodoBase("(C) Foo foo:bar")
...@@ -146,7 +146,7 @@ class TodoBaseTester(TopydoTest): ...@@ -146,7 +146,7 @@ class TodoBaseTester(TopydoTest):
todo = TodoBase("(A) Foo") todo = TodoBase("(A) Foo")
todo.set_priority('B') todo.set_priority('B')
self.assertEquals(todo.priority(), 'B') self.assertEqual(todo.priority(), 'B')
self.assertTrue(re.match(r'^\(B\) Foo$', todo.src)) self.assertTrue(re.match(r'^\(B\) Foo$', todo.src))
def test_set_priority2(self): def test_set_priority2(self):
...@@ -154,7 +154,7 @@ class TodoBaseTester(TopydoTest): ...@@ -154,7 +154,7 @@ class TodoBaseTester(TopydoTest):
todo = TodoBase("Foo") todo = TodoBase("Foo")
todo.set_priority('B') todo.set_priority('B')
self.assertEquals(todo.priority(), 'B') self.assertEqual(todo.priority(), 'B')
self.assertTrue(re.match(r'^\(B\) Foo$', todo.src)) self.assertTrue(re.match(r'^\(B\) Foo$', todo.src))
def test_set_priority3(self): def test_set_priority3(self):
...@@ -162,7 +162,7 @@ class TodoBaseTester(TopydoTest): ...@@ -162,7 +162,7 @@ class TodoBaseTester(TopydoTest):
todo = TodoBase("(A) Foo") todo = TodoBase("(A) Foo")
todo.set_priority('AB') todo.set_priority('AB')
self.assertEquals(todo.priority(), 'A') self.assertEqual(todo.priority(), 'A')
self.assertTrue(re.match(r'^\(A\) Foo$', todo.src)) self.assertTrue(re.match(r'^\(A\) Foo$', todo.src))
def test_set_priority4(self): def test_set_priority4(self):
...@@ -173,7 +173,7 @@ class TodoBaseTester(TopydoTest): ...@@ -173,7 +173,7 @@ class TodoBaseTester(TopydoTest):
todo.set_priority('B') todo.set_priority('B')
self.assertEquals(todo.priority(), 'B') self.assertEqual(todo.priority(), 'B')
self.assertTrue(re.match(r'^\(B\) \(A\)Foo$', todo.src)) self.assertTrue(re.match(r'^\(B\) \(A\)Foo$', todo.src))
def test_set_priority5(self): def test_set_priority5(self):
...@@ -181,7 +181,7 @@ class TodoBaseTester(TopydoTest): ...@@ -181,7 +181,7 @@ class TodoBaseTester(TopydoTest):
todo = TodoBase("(A) Foo") todo = TodoBase("(A) Foo")
todo.set_priority(None) todo.set_priority(None)
self.assertEquals(todo.priority(), None) self.assertEqual(todo.priority(), None)
self.assertTrue(re.match(r'^Foo$', todo.src)) self.assertTrue(re.match(r'^Foo$', todo.src))
def test_set_priority6(self): def test_set_priority6(self):
...@@ -190,32 +190,32 @@ class TodoBaseTester(TopydoTest): ...@@ -190,32 +190,32 @@ class TodoBaseTester(TopydoTest):
todo.set_priority('A') todo.set_priority('A')
self.assertFalse(todo.priority()) self.assertFalse(todo.priority())
self.assertEquals(todo.src, "x 2014-06-13 Foo") self.assertEqual(todo.src, "x 2014-06-13 Foo")
def test_project1(self): def test_project1(self):
todo = TodoBase("(C) Foo +Bar +Baz +Bar:") todo = TodoBase("(C) Foo +Bar +Baz +Bar:")
self.assertEquals(len(todo.projects()), 2) self.assertEqual(len(todo.projects()), 2)
self.assertIn('Bar', todo.projects()) self.assertIn('Bar', todo.projects())
self.assertIn('Baz', todo.projects()) self.assertIn('Baz', todo.projects())
def test_project2(self): def test_project2(self):
todo = TodoBase("(C) Foo +Bar+Baz") todo = TodoBase("(C) Foo +Bar+Baz")
self.assertEquals(len(todo.projects()), 1) self.assertEqual(len(todo.projects()), 1)
self.assertIn('Bar+Baz', todo.projects()) self.assertIn('Bar+Baz', todo.projects())
def test_context1(self): def test_context1(self):
todo = TodoBase("(C) Foo @Bar @Baz @Bar:") todo = TodoBase("(C) Foo @Bar @Baz @Bar:")
self.assertEquals(len(todo.contexts()), 2) self.assertEqual(len(todo.contexts()), 2)
self.assertIn('Bar', todo.contexts()) self.assertIn('Bar', todo.contexts())
self.assertIn('Baz', todo.contexts()) self.assertIn('Baz', todo.contexts())
def test_context2(self): def test_context2(self):
todo = TodoBase("(C) Foo @Bar+Baz") todo = TodoBase("(C) Foo @Bar+Baz")
self.assertEquals(len(todo.contexts()), 1) self.assertEqual(len(todo.contexts()), 1)
self.assertIn('Bar+Baz', todo.contexts()) self.assertIn('Bar+Baz', todo.contexts())
def test_completion1(self): def test_completion1(self):
...@@ -248,7 +248,7 @@ class TodoBaseTester(TopydoTest): ...@@ -248,7 +248,7 @@ class TodoBaseTester(TopydoTest):
today_str = today.isoformat() today_str = today.isoformat()
self.assertFalse(todo.priority()) self.assertFalse(todo.priority())
self.assertEquals(todo.fields['completionDate'], today) self.assertEqual(todo.fields['completionDate'], today)
self.assertTrue(re.match('^x ' + today_str + ' Foo', todo.src)) self.assertTrue(re.match('^x ' + today_str + ' Foo', todo.src))
def test_set_complete2(self): def test_set_complete2(self):
...@@ -258,7 +258,7 @@ class TodoBaseTester(TopydoTest): ...@@ -258,7 +258,7 @@ class TodoBaseTester(TopydoTest):
today = date.today() today = date.today()
today_str = today.isoformat() today_str = today.isoformat()
self.assertEquals(todo.fields['completionDate'], today) self.assertEqual(todo.fields['completionDate'], today)
self.assertTrue(re.match('^x ' + today_str + ' 2014-06-12 Foo', \ self.assertTrue(re.match('^x ' + today_str + ' 2014-06-12 Foo', \
todo.src)) todo.src))
...@@ -269,7 +269,7 @@ class TodoBaseTester(TopydoTest): ...@@ -269,7 +269,7 @@ class TodoBaseTester(TopydoTest):
today = date.today() today = date.today()
today_str = today.isoformat() today_str = today.isoformat()
self.assertEquals(todo.fields['completionDate'], today) self.assertEqual(todo.fields['completionDate'], today)
self.assertTrue(re.match('^x ' + today_str + ' Foo', todo.src)) self.assertTrue(re.match('^x ' + today_str + ' Foo', todo.src))
def test_set_complete4(self): def test_set_complete4(self):
...@@ -279,21 +279,21 @@ class TodoBaseTester(TopydoTest): ...@@ -279,21 +279,21 @@ class TodoBaseTester(TopydoTest):
today = date.today() today = date.today()
today_str = today.isoformat() today_str = today.isoformat()
self.assertEquals(todo.fields['completionDate'], today) self.assertEqual(todo.fields['completionDate'], today)
self.assertTrue(re.match('^x ' + today_str + ' 2014-06-12 Foo', todo.src)) self.assertTrue(re.match('^x ' + today_str + ' 2014-06-12 Foo', todo.src))
def test_set_complete5(self): def test_set_complete5(self):
todo = TodoBase("x 2014-06-13 Foo") todo = TodoBase("x 2014-06-13 Foo")
todo.set_completed() todo.set_completed()
self.assertEquals(todo.src, "x 2014-06-13 Foo") self.assertEqual(todo.src, "x 2014-06-13 Foo")
def test_set_complete6(self): def test_set_complete6(self):
todo = TodoBase("Foo") todo = TodoBase("Foo")
yesterday = date.today() - timedelta(1) yesterday = date.today() - timedelta(1)
todo.set_completed(yesterday) todo.set_completed(yesterday)
self.assertEquals(todo.src, "x {} Foo".format(yesterday.isoformat())) self.assertEqual(todo.src, "x {} Foo".format(yesterday.isoformat()))
def test_set_source_text(self): def test_set_source_text(self):
todo = TodoBase("(B) Foo") todo = TodoBase("(B) Foo")
...@@ -301,8 +301,8 @@ class TodoBaseTester(TopydoTest): ...@@ -301,8 +301,8 @@ class TodoBaseTester(TopydoTest):
new_text = "(C) Foo" new_text = "(C) Foo"
todo.set_source_text(new_text) todo.set_source_text(new_text)
self.assertEquals(todo.src, new_text) self.assertEqual(todo.src, new_text)
self.assertEquals(todo.priority(),'C') self.assertEqual(todo.priority(),'C')
def test_set_creation_date1(self): def test_set_creation_date1(self):
todo = TodoBase("Foo") todo = TodoBase("Foo")
...@@ -310,8 +310,8 @@ class TodoBaseTester(TopydoTest): ...@@ -310,8 +310,8 @@ class TodoBaseTester(TopydoTest):
todo.set_creation_date(creation_date) todo.set_creation_date(creation_date)
self.assertEquals(todo.creation_date(), creation_date) self.assertEqual(todo.creation_date(), creation_date)
self.assertEquals(todo.src, "2014-07-24 Foo") self.assertEqual(todo.src, "2014-07-24 Foo")
def test_set_creation_date2(self): def test_set_creation_date2(self):
todo = TodoBase("(A) Foo") todo = TodoBase("(A) Foo")
...@@ -319,8 +319,8 @@ class TodoBaseTester(TopydoTest): ...@@ -319,8 +319,8 @@ class TodoBaseTester(TopydoTest):
todo.set_creation_date(creation_date) todo.set_creation_date(creation_date)
self.assertEquals(todo.creation_date(), creation_date) self.assertEqual(todo.creation_date(), creation_date)
self.assertEquals(todo.src, "(A) 2014-07-24 Foo") self.assertEqual(todo.src, "(A) 2014-07-24 Foo")
def test_set_creation_date3(self): def test_set_creation_date3(self):
todo = TodoBase("(A) 2014-07-23 Foo") todo = TodoBase("(A) 2014-07-23 Foo")
...@@ -328,8 +328,8 @@ class TodoBaseTester(TopydoTest): ...@@ -328,8 +328,8 @@ class TodoBaseTester(TopydoTest):
todo.set_creation_date(creation_date) todo.set_creation_date(creation_date)
self.assertEquals(todo.creation_date(), creation_date) self.assertEqual(todo.creation_date(), creation_date)
self.assertEquals(todo.src, "(A) 2014-07-24 Foo") self.assertEqual(todo.src, "(A) 2014-07-24 Foo")
def test_set_creation_date4(self): def test_set_creation_date4(self):
todo = TodoBase("2014-07-23 Foo") todo = TodoBase("2014-07-23 Foo")
...@@ -337,8 +337,8 @@ class TodoBaseTester(TopydoTest): ...@@ -337,8 +337,8 @@ class TodoBaseTester(TopydoTest):
todo.set_creation_date(creation_date) todo.set_creation_date(creation_date)
self.assertEquals(todo.creation_date(), creation_date) self.assertEqual(todo.creation_date(), creation_date)
self.assertEquals(todo.src, "2014-07-24 Foo") self.assertEqual(todo.src, "2014-07-24 Foo")
def test_set_creation_date5(self): def test_set_creation_date5(self):
todo = TodoBase("x 2014-07-25 2014-07-23 Foo") todo = TodoBase("x 2014-07-25 2014-07-23 Foo")
...@@ -346,8 +346,8 @@ class TodoBaseTester(TopydoTest): ...@@ -346,8 +346,8 @@ class TodoBaseTester(TopydoTest):
todo.set_creation_date(creation_date) todo.set_creation_date(creation_date)
self.assertEquals(todo.creation_date(), creation_date) self.assertEqual(todo.creation_date(), creation_date)
self.assertEquals(todo.src, "x 2014-07-25 2014-07-24 Foo") self.assertEqual(todo.src, "x 2014-07-25 2014-07-24 Foo")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
test/TodoListTest.py
View file @ 7104428d
...@@ -37,12 +37,12 @@ class TodoListTester(TopydoTest): ...@@ -37,12 +37,12 @@ class TodoListTester(TopydoTest):
self.todolist = TodoList(lines) self.todolist = TodoList(lines)
def test_contexts(self): def test_contexts(self):
self.assertEquals(set(['Context1', 'Context2']), \ self.assertEqual(set(['Context1', 'Context2']), \
self.todolist.contexts()) self.todolist.contexts())
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
def test_projects(self): def test_projects(self):
self.assertEquals(set(['Project1', 'Project2']), \ self.assertEqual(set(['Project1', 'Project2']), \
self.todolist.projects()) self.todolist.projects())
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
...@@ -51,18 +51,18 @@ class TodoListTester(TopydoTest): ...@@ -51,18 +51,18 @@ class TodoListTester(TopydoTest):
count = self.todolist.count() count = self.todolist.count()
todo = self.todolist.add(text) todo = self.todolist.add(text)
self.assertEquals(self.todolist.todo(count+1).source(), text) self.assertEqual(self.todolist.todo(count+1).source(), text)
self.assertEquals(set(['Project1', 'Project2', 'Project3']), \ self.assertEqual(set(['Project1', 'Project2', 'Project3']), \
self.todolist.projects()) self.todolist.projects())
self.assertEquals(set(['Context1', 'Context2', 'Context3']), \ self.assertEqual(set(['Context1', 'Context2', 'Context3']), \
self.todolist.contexts()) self.todolist.contexts())
self.assertEquals(self.todolist.number(todo), 6) self.assertEqual(self.todolist.number(todo), 6)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
def test_add2(self): def test_add2(self):
text = str(self.todolist) text = str(self.todolist)
self.todolist.add('') self.todolist.add('')
self.assertEquals(str(self.todolist), text) self.assertEqual(str(self.todolist), text)
def test_add3a(self): def test_add3a(self):
count = self.todolist.count() count = self.todolist.count()
...@@ -83,21 +83,21 @@ class TodoListTester(TopydoTest): ...@@ -83,21 +83,21 @@ class TodoListTester(TopydoTest):
def test_add4(self): def test_add4(self):
text = str(self.todolist) text = str(self.todolist)
self.todolist.add(' ') self.todolist.add(' ')
self.assertEquals(str(self.todolist), text) self.assertEqual(str(self.todolist), text)
def test_add5(self): def test_add5(self):
text = str(self.todolist) text = str(self.todolist)
self.todolist.add("\n") self.todolist.add("\n")
self.assertEquals(str(self.todolist), text) self.assertEqual(str(self.todolist), text)
def test_delete1(self): def test_delete1(self):
count = self.todolist.count() count = self.todolist.count()
todo = self.todolist.todo(2) todo = self.todolist.todo(2)
self.todolist.delete(todo) self.todolist.delete(todo)
self.assertEquals(self.todolist.todo(2).source(), \ self.assertEqual(self.todolist.todo(2).source(), \
"(C) Baz @Context1 +Project1 key:value") "(C) Baz @Context1 +Project1 key:value")
self.assertEquals(self.todolist.count(), count - 1) self.assertEqual(self.todolist.count(), count - 1)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
self.assertRaises(InvalidTodoException, self.todolist.number, todo) self.assertRaises(InvalidTodoException, self.todolist.number, todo)
...@@ -105,9 +105,9 @@ class TodoListTester(TopydoTest): ...@@ -105,9 +105,9 @@ class TodoListTester(TopydoTest):
todo = self.todolist.todo(3) todo = self.todolist.todo(3)
self.todolist.append(todo, "@Context3") self.todolist.append(todo, "@Context3")
self.assertEquals(todo.source(), \ self.assertEqual(todo.source(), \
"(C) Baz @Context1 +Project1 key:value @Context3") "(C) Baz @Context1 +Project1 key:value @Context3")
self.assertEquals(set(['Context1', 'Context2', 'Context3']), \ self.assertEqual(set(['Context1', 'Context2', 'Context3']), \
self.todolist.contexts()) self.todolist.contexts())
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
...@@ -116,8 +116,8 @@ class TodoListTester(TopydoTest): ...@@ -116,8 +116,8 @@ class TodoListTester(TopydoTest):
text = todo.text() text = todo.text()
self.todolist.append(todo, "foo:bar") self.todolist.append(todo, "foo:bar")
self.assertEquals(todo.text(), text) self.assertEqual(todo.text(), text)
self.assertEquals(todo.source(), \ self.assertEqual(todo.source(), \
"(C) Baz @Context1 +Project1 key:value foo:bar") "(C) Baz @Context1 +Project1 key:value foo:bar")
def test_append3(self): def test_append3(self):
...@@ -125,7 +125,7 @@ class TodoListTester(TopydoTest): ...@@ -125,7 +125,7 @@ class TodoListTester(TopydoTest):
text = todo.text() text = todo.text()
self.todolist.append(todo, '') self.todolist.append(todo, '')
self.assertEquals(todo.text(), text) self.assertEqual(todo.text(), text)
def test_todo(self): def test_todo(self):
count = self.todolist.count() count = self.todolist.count()
...@@ -136,11 +136,11 @@ class TodoListTester(TopydoTest): ...@@ -136,11 +136,11 @@ class TodoListTester(TopydoTest):
def test_string(self): def test_string(self):
# readlines() always ends a string with \n, but join() in str(todolist) # readlines() always ends a string with \n, but join() in str(todolist)
# doesn't necessarily. # doesn't necessarily.
self.assertEquals(str(self.todolist) + '\n', self.text) self.assertEqual(str(self.todolist) + '\n', self.text)
def test_count(self): def test_count(self):
""" Test that empty lines are not counted. """ """ Test that empty lines are not counted. """
self.assertEquals(self.todolist.count(), 5) self.assertEqual(self.todolist.count(), 5)
def test_todo_by_dep_id(self): def test_todo_by_dep_id(self):
""" Tests that todos can be retrieved by their id tag. """ """ Tests that todos can be retrieved by their id tag. """
...@@ -155,7 +155,7 @@ class TodoListTester(TopydoTest): ...@@ -155,7 +155,7 @@ class TodoListTester(TopydoTest):
todo = self.todolist.todo(6) todo = self.todolist.todo(6)
self.assertIsInstance(todo, Todo) self.assertIsInstance(todo, Todo)
self.assertEquals(todo.text(), "No number") self.assertEqual(todo.text(), "No number")
def test_todo_number2(self): def test_todo_number2(self):
todo = Todo("Non-existent") todo = Todo("Non-existent")
...@@ -171,7 +171,7 @@ class TodoListTester(TopydoTest): ...@@ -171,7 +171,7 @@ class TodoListTester(TopydoTest):
todo = self.todolist.todo(1) todo = self.todolist.todo(1)
self.todolist.set_priority(todo, 'F') self.todolist.set_priority(todo, 'F')
self.assertEquals(self.todolist.todo(1).priority(), 'F') self.assertEqual(self.todolist.todo(1).priority(), 'F')
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
def test_todo_priority2(self): def test_todo_priority2(self):
...@@ -183,7 +183,7 @@ class TodoListTester(TopydoTest): ...@@ -183,7 +183,7 @@ class TodoListTester(TopydoTest):
def test_erase(self): def test_erase(self):
self.todolist.erase() self.todolist.erase()
self.assertEquals(self.todolist.count(), 0) self.assertEqual(self.todolist.count(), 0)
self.assertTrue(self.todolist.is_dirty()) self.assertTrue(self.todolist.is_dirty())
def test_regex1(self): def test_regex1(self):
...@@ -193,12 +193,12 @@ class TodoListTester(TopydoTest): ...@@ -193,12 +193,12 @@ class TodoListTester(TopydoTest):
def test_regex3(self): def test_regex3(self):
todo = self.todolist.todo("project2") todo = self.todolist.todo("project2")
self.assertTrue(todo) self.assertTrue(todo)
self.assertEquals(todo.source(), "(D) Bar @Context1 +Project2") self.assertEqual(todo.source(), "(D) Bar @Context1 +Project2")
def test_uid1(self): def test_uid1(self):
config("test/data/todolist-uid.conf") config("test/data/todolist-uid.conf")
self.assertEquals(self.todolist.todo('t5c').source(), "(C) Foo @Context2 Not@Context +Project1 Not+Project") self.assertEqual(self.todolist.todo('t5c').source(), "(C) Foo @Context2 Not@Context +Project1 Not+Project")
def test_uid2(self): def test_uid2(self):
""" Changing the priority should not change the identifier. """ """ Changing the priority should not change the identifier. """
...@@ -206,7 +206,7 @@ class TodoListTester(TopydoTest): ...@@ -206,7 +206,7 @@ class TodoListTester(TopydoTest):
todo = self.todolist.todo('t5c') todo = self.todolist.todo('t5c')
self.todolist.set_priority(todo, 'B') self.todolist.set_priority(todo, 'B')
self.assertEquals(self.todolist.todo('t5c').source(), "(B) Foo @Context2 Not@Context +Project1 Not+Project") self.assertEqual(self.todolist.todo('t5c').source(), "(B) Foo @Context2 Not@Context +Project1 Not+Project")
def test_uid3(self): def test_uid3(self):
""" """
...@@ -299,7 +299,7 @@ class TodoListDependencyTester(TopydoTest): ...@@ -299,7 +299,7 @@ class TodoListDependencyTester(TopydoTest):
self.todolist.add_dependency(todo6, todo7) self.todolist.add_dependency(todo6, todo7)
self.assertEquals(projects, todo7.projects()) self.assertEqual(projects, todo7.projects())
def test_add_dep4(self): def test_add_dep4(self):
""" """
...@@ -312,7 +312,7 @@ class TodoListDependencyTester(TopydoTest): ...@@ -312,7 +312,7 @@ class TodoListDependencyTester(TopydoTest):
self.todolist.add_dependency(todo6, todo8) self.todolist.add_dependency(todo6, todo8)
self.assertEquals(set(["Project", "AnotherProject"]), todo8.projects()) self.assertEqual(set(["Project", "AnotherProject"]), todo8.projects())
def test_remove_dep1(self): def test_remove_dep1(self):
from_todo = self.todolist.todo(3) from_todo = self.todolist.todo(3)
...@@ -328,7 +328,7 @@ class TodoListDependencyTester(TopydoTest): ...@@ -328,7 +328,7 @@ class TodoListDependencyTester(TopydoTest):
to_todo = self.todolist.todo(4) to_todo = self.todolist.todo(4)
self.todolist.remove_dependency(from_todo, to_todo) self.todolist.remove_dependency(from_todo, to_todo)
self.assertEquals(str(self.todolist), old) self.assertEqual(str(self.todolist), old)
def test_remove_todo_check_children(self): def test_remove_todo_check_children(self):
todo = self.todolist.todo(2) todo = self.todolist.todo(2)
......
test/ViewTest.py
View file @ 7104428d
...@@ -34,7 +34,7 @@ class ViewTest(TopydoTest): ...@@ -34,7 +34,7 @@ class ViewTest(TopydoTest):
todofilter = Filter.GrepFilter('+Project') todofilter = Filter.GrepFilter('+Project')
view = todolist.view(sorter, [todofilter]) view = todolist.view(sorter, [todofilter])
self.assertEquals(str(view), todolist_to_string(ref)) self.assertEqual(str(view), todolist_to_string(ref))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
......
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