Renamed unit test method to be more descriptive.

This commit is contained in:
Donne Martin 2015-07-01 06:56:47 -04:00
parent 9e84d8e257
commit df90beea91
3 changed files with 32 additions and 32 deletions

View File

@ -91,7 +91,7 @@
"source": [ "source": [
"class MyLinkedList(LinkedList):\n", "class MyLinkedList(LinkedList):\n",
" \n", " \n",
" def add(self, first_list, second_list):\n", " def add_reverse(self, first_list, second_list):\n",
" # TODO: Implement me\n", " # TODO: Implement me\n",
" pass" " pass"
] ]
@ -126,11 +126,11 @@
"\n", "\n",
"class TestAddReverse(object):\n", "class TestAddReverse(object):\n",
" \n", " \n",
" def test_add(self):\n", " def test_add_reverse(self):\n",
" print('Test: Empty list(s)')\n", " print('Test: Empty list(s)')\n",
" assert_equal(MyLinkedList().add(None, None), None)\n", " assert_equal(MyLinkedList().add_reverse(None, None), None)\n",
" assert_equal(MyLinkedList().add(Node(5), None), None)\n", " assert_equal(MyLinkedList().add_reverse(Node(5), None), None)\n",
" assert_equal(MyLinkedList().add(None, Node(10)), None)\n", " assert_equal(MyLinkedList().add_reverse(None, Node(10)), None)\n",
"\n", "\n",
" print('Test: Add values of different lengths')\n", " print('Test: Add values of different lengths')\n",
" # Input 1: 6->5->None\n", " # Input 1: 6->5->None\n",
@ -141,7 +141,7 @@
" second_list = MyLinkedList(Node(9))\n", " second_list = MyLinkedList(Node(9))\n",
" second_list.append(8)\n", " second_list.append(8)\n",
" second_list.append(7)\n", " second_list.append(7)\n",
" result = MyLinkedList().add(first_list, second_list)\n", " result = MyLinkedList().add_reverse(first_list, second_list)\n",
" assert_equal(result.get_all_data(), [5, 4, 8])\n", " assert_equal(result.get_all_data(), [5, 4, 8])\n",
"\n", "\n",
" print('Test: Add values of same lengths')\n", " print('Test: Add values of same lengths')\n",
@ -156,14 +156,14 @@
" second_list = MyLinkedList(second_head)\n", " second_list = MyLinkedList(second_head)\n",
" second_list.append(8)\n", " second_list.append(8)\n",
" second_list.append(7)\n", " second_list.append(7)\n",
" result = MyLinkedList().add(first_list, second_list)\n", " result = MyLinkedList().add_reverse(first_list, second_list)\n",
" assert_equal(result.get_all_data(), [5, 4, 2, 1])\n", " assert_equal(result.get_all_data(), [5, 4, 2, 1])\n",
" \n", " \n",
" print('Success: test_add')\n", " print('Success: test_add_reverse')\n",
"\n", "\n",
"def main():\n", "def main():\n",
" test = TestAddReverse()\n", " test = TestAddReverse()\n",
" test.test_add()\n", " test.test_add_reverse()\n",
"\n", "\n",
"if __name__ == '__main__':\n", "if __name__ == '__main__':\n",
" main()" " main()"

View File

@ -112,7 +112,7 @@
"source": [ "source": [
"class MyLinkedList(LinkedList):\n", "class MyLinkedList(LinkedList):\n",
" \n", " \n",
" def __add__(self, first_node, second_node, carry):\n", " def __add_reverse__(self, first_node, second_node, carry):\n",
" if type(carry) != int and carry < 0:\n", " if type(carry) != int and carry < 0:\n",
" raise ValueError('Invalid int argument: carry')\n", " raise ValueError('Invalid int argument: carry')\n",
" \n", " \n",
@ -127,15 +127,15 @@
" remainder = value % 10\n", " remainder = value % 10\n",
" new_carry = 1 if value >= 10 else 0\n", " new_carry = 1 if value >= 10 else 0\n",
" node = Node(remainder)\n", " node = Node(remainder)\n",
" node.next = self.__add__(first_node.next if first_node is not None else None, \n", " node.next = self.__add_reverse__(first_node.next if first_node is not None else None, \n",
" second_node.next if first_node is not None else None, \n", " second_node.next if first_node is not None else None, \n",
" new_carry)\n", " new_carry)\n",
" return node\n", " return node\n",
"\n", "\n",
" def add(self, first_list, second_list):\n", " def add_reverse(self, first_list, second_list):\n",
" if first_list is None or second_list is None:\n", " if first_list is None or second_list is None:\n",
" return None\n", " return None\n",
" head = self.__add__(first_list.head, second_list.head, 0)\n", " head = self.__add_reverse__(first_list.head, second_list.head, 0)\n",
" return MyLinkedList(head)" " return MyLinkedList(head)"
] ]
}, },
@ -175,11 +175,11 @@
"\n", "\n",
"class TestAddReverse(object):\n", "class TestAddReverse(object):\n",
" \n", " \n",
" def test_add(self):\n", " def test_add_reverse(self):\n",
" print('Test: Empty list(s)')\n", " print('Test: Empty list(s)')\n",
" assert_equal(MyLinkedList().add(None, None), None)\n", " assert_equal(MyLinkedList().add_reverse(None, None), None)\n",
" assert_equal(MyLinkedList().add(Node(5), None), None)\n", " assert_equal(MyLinkedList().add_reverse(Node(5), None), None)\n",
" assert_equal(MyLinkedList().add(None, Node(10)), None)\n", " assert_equal(MyLinkedList().add_reverse(None, Node(10)), None)\n",
"\n", "\n",
" print('Test: Add values of different lengths')\n", " print('Test: Add values of different lengths')\n",
" # Input 1: 6->5->None\n", " # Input 1: 6->5->None\n",
@ -190,7 +190,7 @@
" second_list = MyLinkedList(Node(9))\n", " second_list = MyLinkedList(Node(9))\n",
" second_list.append(8)\n", " second_list.append(8)\n",
" second_list.append(7)\n", " second_list.append(7)\n",
" result = MyLinkedList().add(first_list, second_list)\n", " result = MyLinkedList().add_reverse(first_list, second_list)\n",
" assert_equal(result.get_all_data(), [5, 4, 8])\n", " assert_equal(result.get_all_data(), [5, 4, 8])\n",
"\n", "\n",
" print('Test: Add values of same lengths')\n", " print('Test: Add values of same lengths')\n",
@ -205,14 +205,14 @@
" second_list = MyLinkedList(second_head)\n", " second_list = MyLinkedList(second_head)\n",
" second_list.append(8)\n", " second_list.append(8)\n",
" second_list.append(7)\n", " second_list.append(7)\n",
" result = MyLinkedList().add(first_list, second_list)\n", " result = MyLinkedList().add_reverse(first_list, second_list)\n",
" assert_equal(result.get_all_data(), [5, 4, 2, 1])\n", " assert_equal(result.get_all_data(), [5, 4, 2, 1])\n",
" \n", " \n",
" print('Success: test_add')\n", " print('Success: test_add_reverse')\n",
"\n", "\n",
"def main():\n", "def main():\n",
" test = TestAddReverse()\n", " test = TestAddReverse()\n",
" test.test_add()\n", " test.test_add_reverse()\n",
"\n", "\n",
"if __name__ == '__main__':\n", "if __name__ == '__main__':\n",
" main()" " main()"
@ -232,7 +232,7 @@
"Test: Empty list(s)\n", "Test: Empty list(s)\n",
"Test: Add values of different lengths\n", "Test: Add values of different lengths\n",
"Test: Add values of same lengths\n", "Test: Add values of same lengths\n",
"Success: test_add\n" "Success: test_add_reverse\n"
] ]
} }
], ],

View File

@ -3,11 +3,11 @@ from nose.tools import assert_equal
class TestAddReverse(object): class TestAddReverse(object):
def test_add(self): def test_add_reverse(self):
print('Test: Empty list(s)') print('Test: Empty list(s)')
assert_equal(MyLinkedList().add(None, None), None) assert_equal(MyLinkedList().add_reverse(None, None), None)
assert_equal(MyLinkedList().add(Node(5), None), None) assert_equal(MyLinkedList().add_reverse(Node(5), None), None)
assert_equal(MyLinkedList().add(None, Node(10)), None) assert_equal(MyLinkedList().add_reverse(None, Node(10)), None)
print('Test: Add values of different lengths') print('Test: Add values of different lengths')
# Input 1: 6->5->None # Input 1: 6->5->None
@ -18,7 +18,7 @@ class TestAddReverse(object):
second_list = MyLinkedList(Node(9)) second_list = MyLinkedList(Node(9))
second_list.append(8) second_list.append(8)
second_list.append(7) second_list.append(7)
result = MyLinkedList().add(first_list, second_list) result = MyLinkedList().add_reverse(first_list, second_list)
assert_equal(result.get_all_data(), [5, 4, 8]) assert_equal(result.get_all_data(), [5, 4, 8])
print('Test: Add values of same lengths') print('Test: Add values of same lengths')
@ -33,14 +33,14 @@ class TestAddReverse(object):
second_list = MyLinkedList(second_head) second_list = MyLinkedList(second_head)
second_list.append(8) second_list.append(8)
second_list.append(7) second_list.append(7)
result = MyLinkedList().add(first_list, second_list) result = MyLinkedList().add_reverse(first_list, second_list)
assert_equal(result.get_all_data(), [5, 4, 2, 1]) assert_equal(result.get_all_data(), [5, 4, 2, 1])
print('Success: test_add') print('Success: test_add_reverse')
def main(): def main():
test = TestAddReverse() test = TestAddReverse()
test.test_add() test.test_add_reverse()
if __name__ == '__main__': if __name__ == '__main__':
main() main()