Skip to content

Commit 0e7ed80

Browse files
donnemartindonnemartin
authored
donnemartin#273: Remove nose dependency for linked_lists/ (donnemartin#275)
1 parent b598f47 commit 0e7ed80

25 files changed

+283
-383
lines changed

‎linked_lists/add_reverse/add_reverse_challenge.ipynb

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@
9595
{
9696
"cell_type": "code",
9797
"execution_count": null,
98-
"metadata": {
99-
"collapsed": false
100-
},
98+
"metadata": {},
10199
"outputs": [],
102100
"source": [
103101
"class MyLinkedList(LinkedList):\n",
@@ -126,22 +124,20 @@
126124
{
127125
"cell_type": "code",
128126
"execution_count": null,
129-
"metadata": {
130-
"collapsed": false
131-
},
127+
"metadata": {},
132128
"outputs": [],
133129
"source": [
134130
"# %load test_add_reverse.py\n",
135-
"from nose.tools import assert_equal\n",
131+
"import unittest\n",
136132
"\n",
137133
"\n",
138-
"class TestAddReverse(object):\n",
134+
"class TestAddReverse(unittest.TestCase):\n",
139135
"\n",
140136
" def test_add_reverse(self):\n",
141137
" print('Test: Empty list(s)')\n",
142-
" assert_equal(MyLinkedList().add_reverse(None, None), None)\n",
143-
" assert_equal(MyLinkedList().add_reverse(Node(5), None), None)\n",
144-
" assert_equal(MyLinkedList().add_reverse(None, Node(10)), None)\n",
138+
" self.assertEqual(MyLinkedList().add_reverse(None, None), None)\n",
139+
" self.assertEqual(MyLinkedList().add_reverse(Node(5), None), None)\n",
140+
" self.assertEqual(MyLinkedList().add_reverse(None, Node(10)), None)\n",
145141
"\n",
146142
" print('Test: Add values of different lengths')\n",
147143
" # Input 1: 6->5->None\n",
@@ -153,7 +149,7 @@
153149
" second_list.append(8)\n",
154150
" second_list.append(7)\n",
155151
" result = MyLinkedList().add_reverse(first_list, second_list)\n",
156-
" assert_equal(result.get_all_data(), [5, 4, 8])\n",
152+
" self.assertEqual(result.get_all_data(), [5, 4, 8])\n",
157153
"\n",
158154
" print('Test: Add values of same lengths')\n",
159155
" # Input 1: 6->5->4\n",
@@ -168,7 +164,7 @@
168164
" second_list.append(8)\n",
169165
" second_list.append(7)\n",
170166
" result = MyLinkedList().add_reverse(first_list, second_list)\n",
171-
" assert_equal(result.get_all_data(), [5, 4, 2, 1])\n",
167+
" self.assertEqual(result.get_all_data(), [5, 4, 2, 1])\n",
172168
"\n",
173169
" print('Success: test_add_reverse')\n",
174170
"\n",
@@ -208,9 +204,9 @@
208204
"name": "python",
209205
"nbconvert_exporter": "python",
210206
"pygments_lexer": "ipython3",
211-
"version": "3.5.0"
207+
"version": "3.7.2"
212208
}
213209
},
214210
"nbformat": 4,
215-
"nbformat_minor": 0
211+
"nbformat_minor": 1
216212
}

‎linked_lists/add_reverse/add_reverse_solution.ipynb

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@
103103
{
104104
"cell_type": "code",
105105
"execution_count": 1,
106-
"metadata": {
107-
"collapsed": true
108-
},
106+
"metadata": {},
109107
"outputs": [],
110108
"source": [
111109
"%run ../linked_list/linked_list.py"
@@ -114,9 +112,7 @@
114112
{
115113
"cell_type": "code",
116114
"execution_count": 2,
117-
"metadata": {
118-
"collapsed": false
119-
},
115+
"metadata": {},
120116
"outputs": [],
121117
"source": [
122118
"class MyLinkedList(LinkedList):\n",
@@ -157,9 +153,7 @@
157153
{
158154
"cell_type": "code",
159155
"execution_count": 3,
160-
"metadata": {
161-
"collapsed": false
162-
},
156+
"metadata": {},
163157
"outputs": [
164158
{
165159
"name": "stdout",
@@ -171,16 +165,16 @@
171165
],
172166
"source": [
173167
"%%writefile test_add_reverse.py\n",
174-
"from nose.tools import assert_equal\n",
168+
"import unittest\n",
175169
"\n",
176170
"\n",
177-
"class TestAddReverse(object):\n",
171+
"class TestAddReverse(unittest.TestCase):\n",
178172
"\n",
179173
" def test_add_reverse(self):\n",
180174
" print('Test: Empty list(s)')\n",
181-
" assert_equal(MyLinkedList().add_reverse(None, None), None)\n",
182-
" assert_equal(MyLinkedList().add_reverse(Node(5), None), None)\n",
183-
" assert_equal(MyLinkedList().add_reverse(None, Node(10)), None)\n",
175+
" self.assertEqual(MyLinkedList().add_reverse(None, None), None)\n",
176+
" self.assertEqual(MyLinkedList().add_reverse(Node(5), None), None)\n",
177+
" self.assertEqual(MyLinkedList().add_reverse(None, Node(10)), None)\n",
184178
"\n",
185179
" print('Test: Add values of different lengths')\n",
186180
" # Input 1: 6->5->None\n",
@@ -192,7 +186,7 @@
192186
" second_list.append(8)\n",
193187
" second_list.append(7)\n",
194188
" result = MyLinkedList().add_reverse(first_list, second_list)\n",
195-
" assert_equal(result.get_all_data(), [5, 4, 8])\n",
189+
" self.assertEqual(result.get_all_data(), [5, 4, 8])\n",
196190
"\n",
197191
" print('Test: Add values of same lengths')\n",
198192
" # Input 1: 6->5->4\n",
@@ -207,7 +201,7 @@
207201
" second_list.append(8)\n",
208202
" second_list.append(7)\n",
209203
" result = MyLinkedList().add_reverse(first_list, second_list)\n",
210-
" assert_equal(result.get_all_data(), [5, 4, 2, 1])\n",
204+
" self.assertEqual(result.get_all_data(), [5, 4, 2, 1])\n",
211205
"\n",
212206
" print('Success: test_add_reverse')\n",
213207
"\n",
@@ -224,9 +218,7 @@
224218
{
225219
"cell_type": "code",
226220
"execution_count": 4,
227-
"metadata": {
228-
"collapsed": false
229-
},
221+
"metadata": {},
230222
"outputs": [
231223
{
232224
"name": "stdout",
@@ -260,9 +252,9 @@
260252
"name": "python",
261253
"nbconvert_exporter": "python",
262254
"pygments_lexer": "ipython3",
263-
"version": "3.5.0"
255+
"version": "3.7.2"
264256
}
265257
},
266258
"nbformat": 4,
267-
"nbformat_minor": 0
259+
"nbformat_minor": 1
268260
}

‎linked_lists/add_reverse/test_add_reverse.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from nose.tools import assert_equal
1+
import unittest
22

33

4-
class TestAddReverse(object):
4+
class TestAddReverse(unittest.TestCase):
55

66
def test_add_reverse(self):
77
print('Test: Empty list(s)')
8-
assert_equal(MyLinkedList().add_reverse(None, None), None)
9-
assert_equal(MyLinkedList().add_reverse(Node(5), None), None)
10-
assert_equal(MyLinkedList().add_reverse(None, Node(10)), None)
8+
self.assertEqual(MyLinkedList().add_reverse(None, None), None)
9+
self.assertEqual(MyLinkedList().add_reverse(Node(5), None), None)
10+
self.assertEqual(MyLinkedList().add_reverse(None, Node(10)), None)
1111

1212
print('Test: Add values of different lengths')
1313
# Input 1: 6->5->None
@@ -19,7 +19,7 @@ def test_add_reverse(self):
1919
second_list.append(8)
2020
second_list.append(7)
2121
result = MyLinkedList().add_reverse(first_list, second_list)
22-
assert_equal(result.get_all_data(), [5, 4, 8])
22+
self.assertEqual(result.get_all_data(), [5, 4, 8])
2323

2424
print('Test: Add values of same lengths')
2525
# Input 1: 6->5->4
@@ -34,7 +34,7 @@ def test_add_reverse(self):
3434
second_list.append(8)
3535
second_list.append(7)
3636
result = MyLinkedList().add_reverse(first_list, second_list)
37-
assert_equal(result.get_all_data(), [5, 4, 2, 1])
37+
self.assertEqual(result.get_all_data(), [5, 4, 2, 1])
3838

3939
print('Success: test_add_reverse')
4040

@@ -45,4 +45,4 @@ def main():
4545

4646

4747
if __name__ == '__main__':
48-
main()
48+
main()

‎linked_lists/delete_mid/delete_mid_challenge.ipynb

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@
7373
{
7474
"cell_type": "code",
7575
"execution_count": null,
76-
"metadata": {
77-
"collapsed": false
78-
},
76+
"metadata": {},
7977
"outputs": [],
8078
"source": [
8179
"%run ../linked_list/linked_list.py\n",
@@ -85,9 +83,7 @@
8583
{
8684
"cell_type": "code",
8785
"execution_count": null,
88-
"metadata": {
89-
"collapsed": false
90-
},
86+
"metadata": {},
9187
"outputs": [],
9288
"source": [
9389
"class MyLinkedList(LinkedList):\n",
@@ -116,28 +112,26 @@
116112
{
117113
"cell_type": "code",
118114
"execution_count": null,
119-
"metadata": {
120-
"collapsed": false
121-
},
115+
"metadata": {},
122116
"outputs": [],
123117
"source": [
124118
"# %load test_delete_mid.py\n",
125-
"from nose.tools import assert_equal\n",
119+
"import unittest\n",
126120
"\n",
127121
"\n",
128-
"class TestDeleteNode(object):\n",
122+
"class TestDeleteNode(unittest.TestCase):\n",
129123
"\n",
130124
" def test_delete_node(self):\n",
131125
" print('Test: Empty list, null node to delete')\n",
132126
" linked_list = MyLinkedList(None)\n",
133127
" linked_list.delete_node(None)\n",
134-
" assert_equal(linked_list.get_all_data(), [])\n",
128+
" self.assertEqual(linked_list.get_all_data(), [])\n",
135129
"\n",
136130
" print('Test: One node')\n",
137131
" head = Node(2)\n",
138132
" linked_list = MyLinkedList(head)\n",
139133
" linked_list.delete_node(head)\n",
140-
" assert_equal(linked_list.get_all_data(), [None])\n",
134+
" self.assertEqual(linked_list.get_all_data(), [None])\n",
141135
"\n",
142136
" print('Test: Multiple nodes')\n",
143137
" linked_list = MyLinkedList(None)\n",
@@ -146,7 +140,7 @@
146140
" node2 = linked_list.insert_to_front(4)\n",
147141
" node3 = linked_list.insert_to_front(1)\n",
148142
" linked_list.delete_node(node1)\n",
149-
" assert_equal(linked_list.get_all_data(), [1, 4, 2])\n",
143+
" self.assertEqual(linked_list.get_all_data(), [1, 4, 2])\n",
150144
"\n",
151145
" print('Test: Multiple nodes, delete last element')\n",
152146
" linked_list = MyLinkedList(None)\n",
@@ -155,7 +149,7 @@
155149
" node2 = linked_list.insert_to_front(4)\n",
156150
" node3 = linked_list.insert_to_front(1)\n",
157151
" linked_list.delete_node(node0)\n",
158-
" assert_equal(linked_list.get_all_data(), [1, 4, 3, None])\n",
152+
" self.assertEqual(linked_list.get_all_data(), [1, 4, 3, None])\n",
159153
"\n",
160154
" print('Success: test_delete_node')\n",
161155
"\n",
@@ -195,9 +189,9 @@
195189
"name": "python",
196190
"nbconvert_exporter": "python",
197191
"pygments_lexer": "ipython3",
198-
"version": "3.5.0"
192+
"version": "3.7.2"
199193
}
200194
},
201195
"nbformat": 4,
202-
"nbformat_minor": 0
196+
"nbformat_minor": 1
203197
}

‎linked_lists/delete_mid/delete_mid_solution.ipynb

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@
7979
{
8080
"cell_type": "code",
8181
"execution_count": 1,
82-
"metadata": {
83-
"collapsed": false
84-
},
82+
"metadata": {},
8583
"outputs": [],
8684
"source": [
8785
"%run ../linked_list/linked_list.py"
@@ -90,9 +88,7 @@
9088
{
9189
"cell_type": "code",
9290
"execution_count": 2,
93-
"metadata": {
94-
"collapsed": false
95-
},
91+
"metadata": {},
9692
"outputs": [],
9793
"source": [
9894
"class MyLinkedList(LinkedList):\n",
@@ -117,9 +113,7 @@
117113
{
118114
"cell_type": "code",
119115
"execution_count": 3,
120-
"metadata": {
121-
"collapsed": false
122-
},
116+
"metadata": {},
123117
"outputs": [
124118
{
125119
"name": "stdout",
@@ -131,22 +125,22 @@
131125
],
132126
"source": [
133127
"%%writefile test_delete_mid.py\n",
134-
"from nose.tools import assert_equal\n",
128+
"import unittest\n",
135129
"\n",
136130
"\n",
137-
"class TestDeleteNode(object):\n",
131+
"class TestDeleteNode(unittest.TestCase):\n",
138132
"\n",
139133
" def test_delete_node(self):\n",
140134
" print('Test: Empty list, null node to delete')\n",
141135
" linked_list = MyLinkedList(None)\n",
142136
" linked_list.delete_node(None)\n",
143-
" assert_equal(linked_list.get_all_data(), [])\n",
137+
" self.assertEqual(linked_list.get_all_data(), [])\n",
144138
"\n",
145139
" print('Test: One node')\n",
146140
" head = Node(2)\n",
147141
" linked_list = MyLinkedList(head)\n",
148142
" linked_list.delete_node(head)\n",
149-
" assert_equal(linked_list.get_all_data(), [None])\n",
143+
" self.assertEqual(linked_list.get_all_data(), [None])\n",
150144
"\n",
151145
" print('Test: Multiple nodes')\n",
152146
" linked_list = MyLinkedList(None)\n",
@@ -155,7 +149,7 @@
155149
" node2 = linked_list.insert_to_front(4)\n",
156150
" node3 = linked_list.insert_to_front(1)\n",
157151
" linked_list.delete_node(node1)\n",
158-
" assert_equal(linked_list.get_all_data(), [1, 4, 2])\n",
152+
" self.assertEqual(linked_list.get_all_data(), [1, 4, 2])\n",
159153
"\n",
160154
" print('Test: Multiple nodes, delete last element')\n",
161155
" linked_list = MyLinkedList(None)\n",
@@ -164,7 +158,7 @@
164158
" node2 = linked_list.insert_to_front(4)\n",
165159
" node3 = linked_list.insert_to_front(1)\n",
166160
" linked_list.delete_node(node0)\n",
167-
" assert_equal(linked_list.get_all_data(), [1, 4, 3, None])\n",
161+
" self.assertEqual(linked_list.get_all_data(), [1, 4, 3, None])\n",
168162
"\n",
169163
" print('Success: test_delete_node')\n",
170164
"\n",
@@ -181,9 +175,7 @@
181175
{
182176
"cell_type": "code",
183177
"execution_count": 4,
184-
"metadata": {
185-
"collapsed": false
186-
},
178+
"metadata": {},
187179
"outputs": [
188180
{
189181
"name": "stdout",
@@ -218,9 +210,9 @@
218210
"name": "python",
219211
"nbconvert_exporter": "python",
220212
"pygments_lexer": "ipython3",
221-
"version": "3.5.0"
213+
"version": "3.7.2"
222214
}
223215
},
224216
"nbformat": 4,
225-
"nbformat_minor": 0
217+
"nbformat_minor": 1
226218
}

0 commit comments

Comments
 (0)