Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d488e4f

Browse files
donnemartindonnemartin
authoredJul 11, 2020
#273: Remove nose dependency for sorting_searching/ (#278)
1 parent abf7524 commit d488e4f

30 files changed

+257
-333
lines changed
 

‎sorting_searching/anagrams/anagrams_challenge.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@
108108
"outputs": [],
109109
"source": [
110110
"# %load test_anagrams.py\n",
111-
"from nose.tools import assert_equal, assert_raises\n",
111+
"import unittest\n",
112112
"\n",
113113
"\n",
114-
"class TestAnagrams(object):\n",
114+
"class TestAnagrams(unittest.TestCase):\n",
115115
"\n",
116116
" def test_group_anagrams(self):\n",
117117
" anagram = Anagram()\n",
118-
" assert_raises(TypeError, anagram.group_anagrams, None)\n",
118+
" self.assertRaises(TypeError, anagram.group_anagrams, None)\n",
119119
" data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']\n",
120120
" expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']\n",
121-
" assert_equal(anagram.group_anagrams(data), expected)\n",
121+
" self.assertEqual(anagram.group_anagrams(data), expected)\n",
122122
"\n",
123123
" print('Success: test_group_anagrams')\n",
124124
"\n",
@@ -158,7 +158,7 @@
158158
"name": "python",
159159
"nbconvert_exporter": "python",
160160
"pygments_lexer": "ipython3",
161-
"version": "3.6.4"
161+
"version": "3.7.2"
162162
}
163163
},
164164
"nbformat": 4,

‎sorting_searching/anagrams/anagrams_solution.ipynb

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@
9898
{
9999
"cell_type": "code",
100100
"execution_count": 1,
101-
"metadata": {
102-
"collapsed": false
103-
},
101+
"metadata": {},
104102
"outputs": [],
105103
"source": [
106104
"from collections import OrderedDict\n",
@@ -138,9 +136,7 @@
138136
{
139137
"cell_type": "code",
140138
"execution_count": 2,
141-
"metadata": {
142-
"collapsed": false
143-
},
139+
"metadata": {},
144140
"outputs": [
145141
{
146142
"name": "stdout",
@@ -152,17 +148,17 @@
152148
],
153149
"source": [
154150
"%%writefile test_anagrams.py\n",
155-
"from nose.tools import assert_equal, assert_raises\n",
151+
"import unittest\n",
156152
"\n",
157153
"\n",
158-
"class TestAnagrams(object):\n",
154+
"class TestAnagrams(unittest.TestCase):\n",
159155
"\n",
160156
" def test_group_anagrams(self):\n",
161157
" anagram = Anagram()\n",
162-
" assert_raises(TypeError, anagram.group_anagrams, None)\n",
158+
" self.assertRaises(TypeError, anagram.group_anagrams, None)\n",
163159
" data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']\n",
164160
" expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']\n",
165-
" assert_equal(anagram.group_anagrams(data), expected)\n",
161+
" self.assertEqual(anagram.group_anagrams(data), expected)\n",
166162
"\n",
167163
" print('Success: test_group_anagrams')\n",
168164
"\n",
@@ -179,9 +175,7 @@
179175
{
180176
"cell_type": "code",
181177
"execution_count": 3,
182-
"metadata": {
183-
"collapsed": false
184-
},
178+
"metadata": {},
185179
"outputs": [
186180
{
187181
"name": "stdout",
@@ -212,9 +206,9 @@
212206
"name": "python",
213207
"nbconvert_exporter": "python",
214208
"pygments_lexer": "ipython3",
215-
"version": "3.5.0"
209+
"version": "3.7.2"
216210
}
217211
},
218212
"nbformat": 4,
219-
"nbformat_minor": 0
213+
"nbformat_minor": 1
220214
}

‎sorting_searching/anagrams/test_anagrams.py

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

33

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

66
def test_group_anagrams(self):
77
anagram = Anagram()
8-
assert_raises(TypeError, anagram.group_anagrams, None)
8+
self.assertRaises(TypeError, anagram.group_anagrams, None)
99
data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']
1010
expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']
11-
assert_equal(anagram.group_anagrams(data), expected)
11+
self.assertEqual(anagram.group_anagrams(data), expected)
1212

1313
print('Success: test_group_anagrams')
1414

@@ -19,4 +19,4 @@ def main():
1919

2020

2121
if __name__ == '__main__':
22-
main()
22+
main()

‎sorting_searching/insertion_sort/insertion_sort_challenge.ipynb

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@
7575
{
7676
"cell_type": "code",
7777
"execution_count": null,
78-
"metadata": {
79-
"collapsed": false
80-
},
78+
"metadata": {},
8179
"outputs": [],
8280
"source": [
8381
"class InsertionSort(object):\n",
@@ -101,32 +99,30 @@
10199
{
102100
"cell_type": "code",
103101
"execution_count": null,
104-
"metadata": {
105-
"collapsed": false
106-
},
102+
"metadata": {},
107103
"outputs": [],
108104
"source": [
109105
"# %load test_insertion_sort.py\n",
110-
"from nose.tools import assert_equal, assert_raises\n",
106+
"import unittest\n",
111107
"\n",
112108
"\n",
113-
"class TestInsertionSort(object):\n",
109+
"class TestInsertionSort(unittest.TestCase):\n",
114110
"\n",
115111
" def test_insertion_sort(self):\n",
116112
" insertion_sort = InsertionSort()\n",
117113
"\n",
118114
" print('None input')\n",
119-
" assert_raises(TypeError, insertion_sort.sort, None)\n",
115+
" self.assertRaises(TypeError, insertion_sort.sort, None)\n",
120116
"\n",
121117
" print('Empty input')\n",
122-
" assert_equal(insertion_sort.sort([]), [])\n",
118+
" self.assertEqual(insertion_sort.sort([]), [])\n",
123119
"\n",
124120
" print('One element')\n",
125-
" assert_equal(insertion_sort.sort([5]), [5])\n",
121+
" self.assertEqual(insertion_sort.sort([5]), [5])\n",
126122
"\n",
127123
" print('Two or more elements')\n",
128124
" data = [5, 1, 7, 2, 6, -3, 5, 7, -1]\n",
129-
" assert_equal(insertion_sort.sort(data), sorted(data))\n",
125+
" self.assertEqual(insertion_sort.sort(data), sorted(data))\n",
130126
"\n",
131127
" print('Success: test_insertion_sort')\n",
132128
"\n",
@@ -166,9 +162,9 @@
166162
"name": "python",
167163
"nbconvert_exporter": "python",
168164
"pygments_lexer": "ipython3",
169-
"version": "3.5.0"
165+
"version": "3.7.2"
170166
}
171167
},
172168
"nbformat": 4,
173-
"nbformat_minor": 0
169+
"nbformat_minor": 1
174170
}

‎sorting_searching/insertion_sort/insertion_sort_solution.ipynb

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@
9393
{
9494
"cell_type": "code",
9595
"execution_count": 1,
96-
"metadata": {
97-
"collapsed": false
98-
},
96+
"metadata": {},
9997
"outputs": [],
10098
"source": [
10199
"class InsertionSort(object):\n",
@@ -125,9 +123,7 @@
125123
{
126124
"cell_type": "code",
127125
"execution_count": 2,
128-
"metadata": {
129-
"collapsed": false
130-
},
126+
"metadata": {},
131127
"outputs": [
132128
{
133129
"name": "stdout",
@@ -139,26 +135,26 @@
139135
],
140136
"source": [
141137
"%%writefile test_insertion_sort.py\n",
142-
"from nose.tools import assert_equal, assert_raises\n",
138+
"import unittest\n",
143139
"\n",
144140
"\n",
145-
"class TestInsertionSort(object):\n",
141+
"class TestInsertionSort(unittest.TestCase):\n",
146142
"\n",
147143
" def test_insertion_sort(self):\n",
148144
" insertion_sort = InsertionSort()\n",
149145
"\n",
150146
" print('None input')\n",
151-
" assert_raises(TypeError, insertion_sort.sort, None)\n",
147+
" self.assertRaises(TypeError, insertion_sort.sort, None)\n",
152148
"\n",
153149
" print('Empty input')\n",
154-
" assert_equal(insertion_sort.sort([]), [])\n",
150+
" self.assertEqual(insertion_sort.sort([]), [])\n",
155151
"\n",
156152
" print('One element')\n",
157-
" assert_equal(insertion_sort.sort([5]), [5])\n",
153+
" self.assertEqual(insertion_sort.sort([5]), [5])\n",
158154
"\n",
159155
" print('Two or more elements')\n",
160156
" data = [5, 1, 7, 2, 6, -3, 5, 7, -1]\n",
161-
" assert_equal(insertion_sort.sort(data), sorted(data))\n",
157+
" self.assertEqual(insertion_sort.sort(data), sorted(data))\n",
162158
"\n",
163159
" print('Success: test_insertion_sort')\n",
164160
"\n",
@@ -175,9 +171,7 @@
175171
{
176172
"cell_type": "code",
177173
"execution_count": 3,
178-
"metadata": {
179-
"collapsed": false
180-
},
174+
"metadata": {},
181175
"outputs": [
182176
{
183177
"name": "stdout",
@@ -212,9 +206,9 @@
212206
"name": "python",
213207
"nbconvert_exporter": "python",
214208
"pygments_lexer": "ipython3",
215-
"version": "3.5.0"
209+
"version": "3.7.2"
216210
}
217211
},
218212
"nbformat": 4,
219-
"nbformat_minor": 0
213+
"nbformat_minor": 1
220214
}

‎sorting_searching/insertion_sort/test_insertion_sort.py

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

33

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

66
def test_insertion_sort(self):
77
insertion_sort = InsertionSort()
88

99
print('None input')
10-
assert_raises(TypeError, insertion_sort.sort, None)
10+
self.assertRaises(TypeError, insertion_sort.sort, None)
1111

1212
print('Empty input')
13-
assert_equal(insertion_sort.sort([]), [])
13+
self.assertEqual(insertion_sort.sort([]), [])
1414

1515
print('One element')
16-
assert_equal(insertion_sort.sort([5]), [5])
16+
self.assertEqual(insertion_sort.sort([5]), [5])
1717

1818
print('Two or more elements')
1919
data = [5, 1, 7, 2, 6, -3, 5, 7, -1]
20-
assert_equal(insertion_sort.sort(data), sorted(data))
20+
self.assertEqual(insertion_sort.sort(data), sorted(data))
2121

2222
print('Success: test_insertion_sort')
2323

@@ -28,4 +28,4 @@ def main():
2828

2929

3030
if __name__ == '__main__':
31-
main()
31+
main()

‎sorting_searching/merge_into/merge_into_challenge.ipynb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,23 @@
111111
"outputs": [],
112112
"source": [
113113
"# %load test_merge_into.py\n",
114-
"from nose.tools import assert_equal, assert_raises\n",
114+
"import unittest\n",
115115
"\n",
116116
"\n",
117-
"class TestArray(object):\n",
117+
"class TestArray(unittest.TestCase):\n",
118118
"\n",
119119
" def test_merge_into(self):\n",
120120
" array = Array()\n",
121-
" assert_raises(TypeError, array.merge_into, None, None, None, None)\n",
122-
" assert_raises(ValueError, array.merge_into, [1], [2], -1, -1)\n",
121+
" self.assertRaises(TypeError, array.merge_into, None, None, None, None)\n",
122+
" self.assertRaises(ValueError, array.merge_into, [1], [2], -1, -1)\n",
123123
" a = [1, 2, 3]\n",
124-
" assert_equal(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
124+
" self.assertEqual(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
125125
" a = [1, 2, 3]\n",
126-
" assert_equal(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
126+
" self.assertEqual(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
127127
" a = [1, 3, 5, 7, 9, None, None, None]\n",
128128
" b = [4, 5, 6]\n",
129129
" expected = [1, 3, 4, 5, 5, 6, 7, 9]\n",
130-
" assert_equal(array.merge_into(a, b, 5, len(b)), expected)\n",
130+
" self.assertEqual(array.merge_into(a, b, 5, len(b)), expected)\n",
131131
" print('Success: test_merge_into')\n",
132132
"\n",
133133
"\n",
@@ -166,7 +166,7 @@
166166
"name": "python",
167167
"nbconvert_exporter": "python",
168168
"pygments_lexer": "ipython3",
169-
"version": "3.6.4"
169+
"version": "3.7.2"
170170
}
171171
},
172172
"nbformat": 4,

0 commit comments

Comments
 (0)
Please sign in to comment.