Skip to content

Commit dce6b6a

Browse files
donnemartindonnemartin
authored
#273: Remove nose dependency for bit_manipulation/ (#279)
1 parent d488e4f commit dce6b6a

24 files changed

+242
-324
lines changed

‎bit_manipulation/bit/bit_challenge.ipynb

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@
9292
{
9393
"cell_type": "code",
9494
"execution_count": null,
95-
"metadata": {
96-
"collapsed": false
97-
},
95+
"metadata": {},
9896
"outputs": [],
9997
"source": [
10098
"class Bit(object):\n",
@@ -145,40 +143,38 @@
145143
{
146144
"cell_type": "code",
147145
"execution_count": null,
148-
"metadata": {
149-
"collapsed": false
150-
},
146+
"metadata": {},
151147
"outputs": [],
152148
"source": [
153149
"# %load test_bit.py\n",
154-
"from nose.tools import assert_equal\n",
150+
"import unittest\n",
155151
"\n",
156152
"\n",
157-
"class TestBit(object):\n",
153+
"class TestBit(unittest.TestCase):\n",
158154
"\n",
159155
" def test_bit(self):\n",
160156
" number = int('10001110', base=2)\n",
161157
" bit = Bit(number)\n",
162-
" assert_equal(bit.get_bit(index=3), True)\n",
158+
" self.assertEqual(bit.get_bit(index=3), True)\n",
163159
" expected = int('10011110', base=2)\n",
164-
" assert_equal(bit.set_bit(index=4), expected)\n",
160+
" self.assertEqual(bit.set_bit(index=4), expected)\n",
165161
" bit = Bit(number)\n",
166162
" expected = int('10000110', base=2)\n",
167-
" assert_equal(bit.clear_bit(index=3), expected)\n",
163+
" self.assertEqual(bit.clear_bit(index=3), expected)\n",
168164
" bit = Bit(number)\n",
169165
" expected = int('00000110', base=2)\n",
170-
" assert_equal(bit.clear_bits_msb_to_index(index=3), expected)\n",
166+
" self.assertEqual(bit.clear_bits_msb_to_index(index=3), expected)\n",
171167
" bit = Bit(number)\n",
172168
" expected = int('10000000', base=2)\n",
173-
" assert_equal(bit.clear_bits_index_to_lsb(index=3), expected)\n",
169+
" self.assertEqual(bit.clear_bits_index_to_lsb(index=3), expected)\n",
174170
" bit = Bit(number)\n",
175-
" assert_equal(bit.update_bit(index=3, value=1), number)\n",
171+
" self.assertEqual(bit.update_bit(index=3, value=1), number)\n",
176172
" bit = Bit(number)\n",
177173
" expected = int('10000110', base=2)\n",
178-
" assert_equal(bit.update_bit(index=3, value=0), expected)\n",
174+
" self.assertEqual(bit.update_bit(index=3, value=0), expected)\n",
179175
" bit = Bit(number)\n",
180176
" expected = int('10001111', base=2)\n",
181-
" assert_equal(bit.update_bit(index=0, value=1), expected)\n",
177+
" self.assertEqual(bit.update_bit(index=0, value=1), expected)\n",
182178
" print('Success: test_bit')\n",
183179
"\n",
184180
"\n",
@@ -217,9 +213,9 @@
217213
"name": "python",
218214
"nbconvert_exporter": "python",
219215
"pygments_lexer": "ipython3",
220-
"version": "3.5.0"
216+
"version": "3.7.2"
221217
}
222218
},
223219
"nbformat": 4,
224-
"nbformat_minor": 0
220+
"nbformat_minor": 1
225221
}

‎bit_manipulation/bit/bit_solution.ipynb

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,7 @@
179179
{
180180
"cell_type": "code",
181181
"execution_count": 1,
182-
"metadata": {
183-
"collapsed": true
184-
},
182+
"metadata": {},
185183
"outputs": [],
186184
"source": [
187185
"def validate_index(func):\n",
@@ -196,9 +194,7 @@
196194
{
197195
"cell_type": "code",
198196
"execution_count": 2,
199-
"metadata": {
200-
"collapsed": false
201-
},
197+
"metadata": {},
202198
"outputs": [],
203199
"source": [
204200
"class Bit(object):\n",
@@ -260,9 +256,7 @@
260256
{
261257
"cell_type": "code",
262258
"execution_count": 3,
263-
"metadata": {
264-
"collapsed": false
265-
},
259+
"metadata": {},
266260
"outputs": [
267261
{
268262
"name": "stdout",
@@ -274,34 +268,34 @@
274268
],
275269
"source": [
276270
"%%writefile test_bit.py\n",
277-
"from nose.tools import assert_equal\n",
271+
"import unittest\n",
278272
"\n",
279273
"\n",
280-
"class TestBit(object):\n",
274+
"class TestBit(unittest.TestCase):\n",
281275
"\n",
282276
" def test_bit(self):\n",
283277
" number = int('10001110', base=2)\n",
284278
" bit = Bit(number)\n",
285-
" assert_equal(bit.get_bit(index=3), True)\n",
279+
" self.assertEqual(bit.get_bit(index=3), True)\n",
286280
" expected = int('10011110', base=2)\n",
287-
" assert_equal(bit.set_bit(index=4), expected)\n",
281+
" self.assertEqual(bit.set_bit(index=4), expected)\n",
288282
" bit = Bit(number)\n",
289283
" expected = int('10000110', base=2)\n",
290-
" assert_equal(bit.clear_bit(index=3), expected)\n",
284+
" self.assertEqual(bit.clear_bit(index=3), expected)\n",
291285
" bit = Bit(number)\n",
292286
" expected = int('00000110', base=2)\n",
293-
" assert_equal(bit.clear_bits_msb_to_index(index=3), expected)\n",
287+
" self.assertEqual(bit.clear_bits_msb_to_index(index=3), expected)\n",
294288
" bit = Bit(number)\n",
295289
" expected = int('10000000', base=2)\n",
296-
" assert_equal(bit.clear_bits_index_to_lsb(index=3), expected)\n",
290+
" self.assertEqual(bit.clear_bits_index_to_lsb(index=3), expected)\n",
297291
" bit = Bit(number)\n",
298-
" assert_equal(bit.update_bit(index=3, value=1), number)\n",
292+
" self.assertEqual(bit.update_bit(index=3, value=1), number)\n",
299293
" bit = Bit(number)\n",
300294
" expected = int('10000110', base=2)\n",
301-
" assert_equal(bit.update_bit(index=3, value=0), expected)\n",
295+
" self.assertEqual(bit.update_bit(index=3, value=0), expected)\n",
302296
" bit = Bit(number)\n",
303297
" expected = int('10001111', base=2)\n",
304-
" assert_equal(bit.update_bit(index=0, value=1), expected)\n",
298+
" self.assertEqual(bit.update_bit(index=0, value=1), expected)\n",
305299
" print('Success: test_bit')\n",
306300
"\n",
307301
"\n",
@@ -317,9 +311,7 @@
317311
{
318312
"cell_type": "code",
319313
"execution_count": 4,
320-
"metadata": {
321-
"collapsed": false
322-
},
314+
"metadata": {},
323315
"outputs": [
324316
{
325317
"name": "stdout",
@@ -350,9 +342,9 @@
350342
"name": "python",
351343
"nbconvert_exporter": "python",
352344
"pygments_lexer": "ipython3",
353-
"version": "3.5.0"
345+
"version": "3.7.2"
354346
}
355347
},
356348
"nbformat": 4,
357-
"nbformat_minor": 0
349+
"nbformat_minor": 1
358350
}

‎bit_manipulation/bit/test_bit.py

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

33

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

66
def test_bit(self):
77
number = int('10001110', base=2)
88
bit = Bit(number)
9-
assert_equal(bit.get_bit(index=3), True)
9+
self.assertEqual(bit.get_bit(index=3), True)
1010
expected = int('10011110', base=2)
11-
assert_equal(bit.set_bit(index=4), expected)
11+
self.assertEqual(bit.set_bit(index=4), expected)
1212
bit = Bit(number)
1313
expected = int('10000110', base=2)
14-
assert_equal(bit.clear_bit(index=3), expected)
14+
self.assertEqual(bit.clear_bit(index=3), expected)
1515
bit = Bit(number)
1616
expected = int('00000110', base=2)
17-
assert_equal(bit.clear_bits_msb_to_index(index=3), expected)
17+
self.assertEqual(bit.clear_bits_msb_to_index(index=3), expected)
1818
bit = Bit(number)
1919
expected = int('10000000', base=2)
20-
assert_equal(bit.clear_bits_index_to_lsb(index=3), expected)
20+
self.assertEqual(bit.clear_bits_index_to_lsb(index=3), expected)
2121
bit = Bit(number)
22-
assert_equal(bit.update_bit(index=3, value=1), number)
22+
self.assertEqual(bit.update_bit(index=3, value=1), number)
2323
bit = Bit(number)
2424
expected = int('10000110', base=2)
25-
assert_equal(bit.update_bit(index=3, value=0), expected)
25+
self.assertEqual(bit.update_bit(index=3, value=0), expected)
2626
bit = Bit(number)
2727
expected = int('10001111', base=2)
28-
assert_equal(bit.update_bit(index=0, value=1), expected)
28+
self.assertEqual(bit.update_bit(index=0, value=1), expected)
2929
print('Success: test_bit')
3030

3131

@@ -35,4 +35,4 @@ def main():
3535

3636

3737
if __name__ == '__main__':
38-
main()
38+
main()

‎bit_manipulation/bits_to_flip/bits_to_flip_challenge.ipynb

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@
8080
{
8181
"cell_type": "code",
8282
"execution_count": null,
83-
"metadata": {
84-
"collapsed": false
85-
},
83+
"metadata": {},
8684
"outputs": [],
8785
"source": [
8886
"class Bits(object):\n",
@@ -109,23 +107,21 @@
109107
{
110108
"cell_type": "code",
111109
"execution_count": null,
112-
"metadata": {
113-
"collapsed": false
114-
},
110+
"metadata": {},
115111
"outputs": [],
116112
"source": [
117113
"# %load test_bits_to_flip.py\n",
118-
"from nose.tools import assert_equal\n",
114+
"import unittest\n",
119115
"\n",
120116
"\n",
121-
"class TestBits(object):\n",
117+
"class TestBits(unittest.TestCase):\n",
122118
"\n",
123119
" def test_bits_to_flip(self):\n",
124120
" bits = Bits()\n",
125121
" a = int('11101', base=2)\n",
126122
" b = int('01111', base=2)\n",
127123
" expected = 2\n",
128-
" assert_equal(bits.bits_to_flip(a, b), expected)\n",
124+
" self.assertEqual(bits.bits_to_flip(a, b), expected)\n",
129125
" print('Success: test_bits_to_flip')\n",
130126
"\n",
131127
"\n",
@@ -164,9 +160,9 @@
164160
"name": "python",
165161
"nbconvert_exporter": "python",
166162
"pygments_lexer": "ipython3",
167-
"version": "3.5.0"
163+
"version": "3.7.2"
168164
}
169165
},
170166
"nbformat": 4,
171-
"nbformat_minor": 0
167+
"nbformat_minor": 1
172168
}

‎bit_manipulation/bits_to_flip/bits_to_flip_solution.ipynb

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@
9191
{
9292
"cell_type": "code",
9393
"execution_count": 1,
94-
"metadata": {
95-
"collapsed": false
96-
},
94+
"metadata": {},
9795
"outputs": [],
9896
"source": [
9997
"class Bits(object):\n",
@@ -119,9 +117,7 @@
119117
{
120118
"cell_type": "code",
121119
"execution_count": 2,
122-
"metadata": {
123-
"collapsed": false
124-
},
120+
"metadata": {},
125121
"outputs": [
126122
{
127123
"name": "stdout",
@@ -133,17 +129,17 @@
133129
],
134130
"source": [
135131
"%%writefile test_bits_to_flip.py\n",
136-
"from nose.tools import assert_equal\n",
132+
"import unittest\n",
137133
"\n",
138134
"\n",
139-
"class TestBits(object):\n",
135+
"class TestBits(unittest.TestCase):\n",
140136
"\n",
141137
" def test_bits_to_flip(self):\n",
142138
" bits = Bits()\n",
143139
" a = int('11101', base=2)\n",
144140
" b = int('01111', base=2)\n",
145141
" expected = 2\n",
146-
" assert_equal(bits.bits_to_flip(a, b), expected)\n",
142+
" self.assertEqual(bits.bits_to_flip(a, b), expected)\n",
147143
" print('Success: test_bits_to_flip')\n",
148144
"\n",
149145
"\n",
@@ -159,9 +155,7 @@
159155
{
160156
"cell_type": "code",
161157
"execution_count": 3,
162-
"metadata": {
163-
"collapsed": false
164-
},
158+
"metadata": {},
165159
"outputs": [
166160
{
167161
"name": "stdout",
@@ -192,9 +186,9 @@
192186
"name": "python",
193187
"nbconvert_exporter": "python",
194188
"pygments_lexer": "ipython3",
195-
"version": "3.5.0"
189+
"version": "3.7.2"
196190
}
197191
},
198192
"nbformat": 4,
199-
"nbformat_minor": 0
193+
"nbformat_minor": 1
200194
}

‎bit_manipulation/bits_to_flip/test_bits_to_flip.py

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

33

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

66
def test_bits_to_flip(self):
77
bits = Bits()
88
a = int('11101', base=2)
99
b = int('01111', base=2)
1010
expected = 2
11-
assert_equal(bits.bits_to_flip(a, b), expected)
11+
self.assertEqual(bits.bits_to_flip(a, b), expected)
1212
print('Success: test_bits_to_flip')
1313

1414

@@ -18,4 +18,4 @@ def main():
1818

1919

2020
if __name__ == '__main__':
21-
main()
21+
main()

0 commit comments

Comments
 (0)