Commit b26c9b1f authored by Bram Schoenmakers's avatar Bram Schoenmakers

Fix EditCommandTest after moving commands to separate package.

parent d20df450
...@@ -18,7 +18,7 @@ import unittest ...@@ -18,7 +18,7 @@ import unittest
import mock import mock
import CommandTest import CommandTest
from topydo.lib.EditCommand import EditCommand from topydo.commands.EditCommand import EditCommand
from topydo.lib.TodoList import TodoList from topydo.lib.TodoList import TodoList
from topydo.lib.Todo import Todo from topydo.lib.Todo import Todo
...@@ -34,7 +34,7 @@ class EditCommandTest(CommandTest.CommandTest): ...@@ -34,7 +34,7 @@ class EditCommandTest(CommandTest.CommandTest):
self.todolist = TodoList(todos) self.todolist = TodoList(todos)
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.commands.EditCommand.EditCommand._open_in_editor')
def test_edit1(self, mock_open_in_editor): def test_edit1(self, mock_open_in_editor):
""" Preserve dependencies after editing. """ """ Preserve dependencies after editing. """
mock_open_in_editor.return_value = 0 mock_open_in_editor.return_value = 0
...@@ -46,8 +46,8 @@ class EditCommandTest(CommandTest.CommandTest): ...@@ -46,8 +46,8 @@ class EditCommandTest(CommandTest.CommandTest):
self.assertEquals(self.errors, "") self.assertEquals(self.errors, "")
self.assertEquals(str(self.todolist), "Bar p:1 @test\nBaz @test\nFoo id:1") self.assertEquals(str(self.todolist), "Bar p:1 @test\nBaz @test\nFoo id:1")
@mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp') @mock.patch('topydo.commands.EditCommand.EditCommand._todos_from_temp')
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.commands.EditCommand.EditCommand._open_in_editor')
def test_edit2(self, mock_open_in_editor, mock_todos_from_temp): def test_edit2(self, mock_open_in_editor, mock_todos_from_temp):
""" Edit some todo. """ """ Edit some todo. """
mock_open_in_editor.return_value = 0 mock_open_in_editor.return_value = 0
...@@ -76,8 +76,8 @@ class EditCommandTest(CommandTest.CommandTest): ...@@ -76,8 +76,8 @@ class EditCommandTest(CommandTest.CommandTest):
self.assertFalse(self.todolist.is_dirty()) self.assertFalse(self.todolist.is_dirty())
self.assertEquals(self.errors, "Invalid todo number given: 4.\n") self.assertEquals(self.errors, "Invalid todo number given: 4.\n")
@mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp') @mock.patch('topydo.commands.EditCommand.EditCommand._todos_from_temp')
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.commands.EditCommand.EditCommand._open_in_editor')
def test_edit5(self, mock_open_in_editor, mock_todos_from_temp): def test_edit5(self, mock_open_in_editor, mock_todos_from_temp):
""" Don't let to delete todos acidentally while editing. """ """ Don't let to delete todos acidentally while editing. """
mock_open_in_editor.return_value = 0 mock_open_in_editor.return_value = 0
...@@ -90,8 +90,8 @@ class EditCommandTest(CommandTest.CommandTest): ...@@ -90,8 +90,8 @@ class EditCommandTest(CommandTest.CommandTest):
self.assertEquals(self.errors, "Number of edited todos is not equal to number of supplied todo IDs.\n") self.assertEquals(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.assertEquals(str(self.todolist), "Foo id:1\nBar p:1 @test\nBaz @test")
@mock.patch('topydo.lib.EditCommand.EditCommand._todos_from_temp') @mock.patch('topydo.commands.EditCommand.EditCommand._todos_from_temp')
@mock.patch('topydo.lib.EditCommand.EditCommand._open_in_editor') @mock.patch('topydo.commands.EditCommand.EditCommand._open_in_editor')
def test_edit_expr(self, mock_open_in_editor, mock_todos_from_temp): def test_edit_expr(self, mock_open_in_editor, mock_todos_from_temp):
""" Edit todos matching expression. """ """ Edit todos matching expression. """
mock_open_in_editor.return_value = 0 mock_open_in_editor.return_value = 0
......
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