Skip to content

Commit 78cb59a

Browse files
donnemartindonnemartin
committed
#273: Remove nose dependency for math_probability/
1 parent 76cb650 commit 78cb59a

21 files changed

+212
-280
lines changed

‎math_probability/add_digits/add_digits_challenge.ipynb

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
{
7777
"cell_type": "code",
7878
"execution_count": null,
79-
"metadata": {
80-
"collapsed": false
81-
},
79+
"metadata": {},
8280
"outputs": [],
8381
"source": [
8482
"class Solution(object):\n",
@@ -105,24 +103,22 @@
105103
{
106104
"cell_type": "code",
107105
"execution_count": null,
108-
"metadata": {
109-
"collapsed": false
110-
},
106+
"metadata": {},
111107
"outputs": [],
112108
"source": [
113109
"# %load test_add_digits.py\n",
114-
"from nose.tools import assert_equal, assert_raises\n",
110+
"import unittest\n",
115111
"\n",
116112
"\n",
117-
"class TestAddDigits(object):\n",
113+
"class TestAddDigits(unittest.TestCase):\n",
118114
"\n",
119115
" def test_add_digits(self, func):\n",
120-
" assert_raises(TypeError, func, None)\n",
121-
" assert_raises(ValueError, func, -1)\n",
122-
" assert_equal(func(0), 0)\n",
123-
" assert_equal(func(9), 9)\n",
124-
" assert_equal(func(138), 3)\n",
125-
" assert_equal(func(65536), 7) \n",
116+
" self.assertRaises(TypeError, func, None)\n",
117+
" self.assertRaises(ValueError, func, -1)\n",
118+
" self.assertEqual(func(0), 0)\n",
119+
" self.assertEqual(func(9), 9)\n",
120+
" self.assertEqual(func(138), 3)\n",
121+
" self.assertEqual(func(65536), 7) \n",
126122
" print('Success: test_add_digits')\n",
127123
"\n",
128124
"\n",
@@ -168,9 +164,9 @@
168164
"name": "python",
169165
"nbconvert_exporter": "python",
170166
"pygments_lexer": "ipython3",
171-
"version": "3.5.0"
167+
"version": "3.7.2"
172168
}
173169
},
174170
"nbformat": 4,
175-
"nbformat_minor": 0
171+
"nbformat_minor": 1
176172
}

‎math_probability/add_digits/add_digits_solution.ipynb

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@
8989
{
9090
"cell_type": "code",
9191
"execution_count": 1,
92-
"metadata": {
93-
"collapsed": false
94-
},
92+
"metadata": {},
9593
"outputs": [],
9694
"source": [
9795
"class Solution(object):\n",
@@ -134,9 +132,7 @@
134132
{
135133
"cell_type": "code",
136134
"execution_count": 2,
137-
"metadata": {
138-
"collapsed": false
139-
},
135+
"metadata": {},
140136
"outputs": [
141137
{
142138
"name": "stdout",
@@ -148,18 +144,18 @@
148144
],
149145
"source": [
150146
"%%writefile test_add_digits.py\n",
151-
"from nose.tools import assert_equal, assert_raises\n",
147+
"import unittest\n",
152148
"\n",
153149
"\n",
154-
"class TestAddDigits(object):\n",
150+
"class TestAddDigits(unittest.TestCase):\n",
155151
"\n",
156152
" def test_add_digits(self, func):\n",
157-
" assert_raises(TypeError, func, None)\n",
158-
" assert_raises(ValueError, func, -1)\n",
159-
" assert_equal(func(0), 0)\n",
160-
" assert_equal(func(9), 9)\n",
161-
" assert_equal(func(138), 3)\n",
162-
" assert_equal(func(65536), 7) \n",
153+
" self.assertRaises(TypeError, func, None)\n",
154+
" self.assertRaises(ValueError, func, -1)\n",
155+
" self.assertEqual(func(0), 0)\n",
156+
" self.assertEqual(func(9), 9)\n",
157+
" self.assertEqual(func(138), 3)\n",
158+
" self.assertEqual(func(65536), 7) \n",
163159
" print('Success: test_add_digits')\n",
164160
"\n",
165161
"\n",
@@ -182,9 +178,7 @@
182178
{
183179
"cell_type": "code",
184180
"execution_count": 3,
185-
"metadata": {
186-
"collapsed": false
187-
},
181+
"metadata": {},
188182
"outputs": [
189183
{
190184
"name": "stdout",
@@ -216,9 +210,9 @@
216210
"name": "python",
217211
"nbconvert_exporter": "python",
218212
"pygments_lexer": "ipython3",
219-
"version": "3.4.3"
213+
"version": "3.7.2"
220214
}
221215
},
222216
"nbformat": 4,
223-
"nbformat_minor": 0
217+
"nbformat_minor": 1
224218
}

‎math_probability/add_digits/test_add_digits.py

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

33

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

66
def test_add_digits(self, func):
7-
assert_raises(TypeError, func, None)
8-
assert_raises(ValueError, func, -1)
9-
assert_equal(func(0), 0)
10-
assert_equal(func(9), 9)
11-
assert_equal(func(138), 3)
12-
assert_equal(func(65536), 7)
7+
self.assertRaises(TypeError, func, None)
8+
self.assertRaises(ValueError, func, -1)
9+
self.assertEqual(func(0), 0)
10+
self.assertEqual(func(9), 9)
11+
self.assertEqual(func(138), 3)
12+
self.assertEqual(func(65536), 7)
1313
print('Success: test_add_digits')
1414

1515

@@ -26,4 +26,4 @@ def main():
2626

2727

2828
if __name__ == '__main__':
29-
main()
29+
main()

‎math_probability/check_prime/check_prime_challenge.ipynb

Lines changed: 11 additions & 15 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
"class Math(object):\n",
@@ -102,24 +100,22 @@
102100
{
103101
"cell_type": "code",
104102
"execution_count": null,
105-
"metadata": {
106-
"collapsed": false
107-
},
103+
"metadata": {},
108104
"outputs": [],
109105
"source": [
110106
"# %load test_check_prime.py\n",
111-
"from nose.tools import assert_equal, assert_raises\n",
107+
"import unittest\n",
112108
"\n",
113109
"\n",
114-
"class TestMath(object):\n",
110+
"class TestMath(unittest.TestCase):\n",
115111
"\n",
116112
" def test_check_prime(self):\n",
117113
" math = Math()\n",
118-
" assert_raises(TypeError, math.check_prime, None)\n",
119-
" assert_raises(TypeError, math.check_prime, 98.6)\n",
120-
" assert_equal(math.check_prime(0), False)\n",
121-
" assert_equal(math.check_prime(1), False)\n",
122-
" assert_equal(math.check_prime(97), True)\n",
114+
" self.assertRaises(TypeError, math.check_prime, None)\n",
115+
" self.assertRaises(TypeError, math.check_prime, 98.6)\n",
116+
" self.assertEqual(math.check_prime(0), False)\n",
117+
" self.assertEqual(math.check_prime(1), False)\n",
118+
" self.assertEqual(math.check_prime(97), True)\n",
123119
" print('Success: test_check_prime')\n",
124120
"\n",
125121
"\n",
@@ -158,9 +154,9 @@
158154
"name": "python",
159155
"nbconvert_exporter": "python",
160156
"pygments_lexer": "ipython3",
161-
"version": "3.5.0"
157+
"version": "3.7.2"
162158
}
163159
},
164160
"nbformat": 4,
165-
"nbformat_minor": 0
161+
"nbformat_minor": 1
166162
}

‎math_probability/check_prime/check_prime_solution.ipynb

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@
8484
{
8585
"cell_type": "code",
8686
"execution_count": 1,
87-
"metadata": {
88-
"collapsed": false
89-
},
87+
"metadata": {},
9088
"outputs": [],
9189
"source": [
9290
"import math\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,18 +135,18 @@
139135
],
140136
"source": [
141137
"%%writefile test_check_prime.py\n",
142-
"from nose.tools import assert_equal, assert_raises\n",
138+
"import unittest\n",
143139
"\n",
144140
"\n",
145-
"class TestMath(object):\n",
141+
"class TestMath(unittest.TestCase):\n",
146142
"\n",
147143
" def test_check_prime(self):\n",
148144
" math = Math()\n",
149-
" assert_raises(TypeError, math.check_prime, None)\n",
150-
" assert_raises(TypeError, math.check_prime, 98.6)\n",
151-
" assert_equal(math.check_prime(0), False)\n",
152-
" assert_equal(math.check_prime(1), False)\n",
153-
" assert_equal(math.check_prime(97), True)\n",
145+
" self.assertRaises(TypeError, math.check_prime, None)\n",
146+
" self.assertRaises(TypeError, math.check_prime, 98.6)\n",
147+
" self.assertEqual(math.check_prime(0), False)\n",
148+
" self.assertEqual(math.check_prime(1), False)\n",
149+
" self.assertEqual(math.check_prime(97), True)\n",
154150
" print('Success: test_check_prime')\n",
155151
"\n",
156152
"\n",
@@ -166,9 +162,7 @@
166162
{
167163
"cell_type": "code",
168164
"execution_count": 3,
169-
"metadata": {
170-
"collapsed": false
171-
},
165+
"metadata": {},
172166
"outputs": [
173167
{
174168
"name": "stdout",
@@ -199,9 +193,9 @@
199193
"name": "python",
200194
"nbconvert_exporter": "python",
201195
"pygments_lexer": "ipython3",
202-
"version": "3.5.0"
196+
"version": "3.7.2"
203197
}
204198
},
205199
"nbformat": 4,
206-
"nbformat_minor": 0
200+
"nbformat_minor": 1
207201
}

‎math_probability/check_prime/test_check_prime.py

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

33

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

66
def test_check_prime(self):
77
math = Math()
8-
assert_raises(TypeError, math.check_prime, None)
9-
assert_raises(TypeError, math.check_prime, 98.6)
10-
assert_equal(math.check_prime(0), False)
11-
assert_equal(math.check_prime(1), False)
12-
assert_equal(math.check_prime(97), True)
8+
self.assertRaises(TypeError, math.check_prime, None)
9+
self.assertRaises(TypeError, math.check_prime, 98.6)
10+
self.assertEqual(math.check_prime(0), False)
11+
self.assertEqual(math.check_prime(1), False)
12+
self.assertEqual(math.check_prime(97), True)
1313
print('Success: test_check_prime')
1414

1515

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

2020

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

‎math_probability/generate_primes/check_prime_challenge.ipynb

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@
7272
{
7373
"cell_type": "code",
7474
"execution_count": 3,
75-
"metadata": {
76-
"collapsed": false
77-
},
75+
"metadata": {},
7876
"outputs": [],
7977
"source": [
8078
"class PrimeGenerator(object):\n",
@@ -101,22 +99,20 @@
10199
{
102100
"cell_type": "code",
103101
"execution_count": null,
104-
"metadata": {
105-
"collapsed": false
106-
},
102+
"metadata": {},
107103
"outputs": [],
108104
"source": [
109105
"# %load test_generate_primes.py\n",
110-
"from nose.tools import assert_equal, assert_raises\n",
106+
"import unittest\n",
111107
"\n",
112108
"\n",
113-
"class TestMath(object):\n",
109+
"class TestMath(unittest.TestCase):\n",
114110
"\n",
115111
" def test_generate_primes(self):\n",
116112
" prime_generator = PrimeGenerator()\n",
117-
" assert_raises(TypeError, prime_generator.generate_primes, None)\n",
118-
" assert_raises(TypeError, prime_generator.generate_primes, 98.6)\n",
119-
" assert_equal(prime_generator.generate_primes(20), [False, False, True, \n",
113+
" self.assertRaises(TypeError, prime_generator.generate_primes, None)\n",
114+
" self.assertRaises(TypeError, prime_generator.generate_primes, 98.6)\n",
115+
" self.assertEqual(prime_generator.generate_primes(20), [False, False, True, \n",
120116
" True, False, True, \n",
121117
" False, True, False, \n",
122118
" False, False, True, \n",
@@ -161,9 +157,9 @@
161157
"name": "python",
162158
"nbconvert_exporter": "python",
163159
"pygments_lexer": "ipython3",
164-
"version": "3.5.0"
160+
"version": "3.7.2"
165161
}
166162
},
167163
"nbformat": 4,
168-
"nbformat_minor": 0
164+
"nbformat_minor": 1
169165
}

0 commit comments

Comments
 (0)