Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -2,8 +2,7 @@ · 1 unmodified line | |||
| 2 | # -*- coding: utf-8 -*- | 2 | # -*- coding: utf-8 -*- |
| 3 | 3 | ||
| 4 | from aubio import midi2note | 4 | from aubio import midi2note |
| 5 | from nose2.tools import params | 5 | from ._tools import parametrize, assert_raises |
| 6 | import unittest | ||
| 7 | 6 | ||
| 8 | list_of_known_midis = ( | 7 | list_of_known_midis = ( |
| 9 | ( 0, 'C-1' ), | 8 | ( 0, 'C-1' ), |
| @@ -15,31 +14,31 @@ list_of_known_midis = ( · 5 unmodified lines | |||
| 15 | ( 127, 'G9' ), | 14 | ( 127, 'G9' ), |
| 16 | ) | 15 | ) |
| 17 | 16 | ||
| 18 | class midi2note_good_values(unittest.TestCase): | 17 | class Test_midi2note_good_values: |
| 19 | 18 | ||
| 20 | @params(*list_of_known_midis) | 19 | @parametrize('midi, note', list_of_known_midis) |
| 21 | def test_midi2note_known_values(self, midi, note): | 20 | def test_midi2note_known_values(self, midi, note): |
| 22 | " known values are correctly converted " | 21 | " known values are correctly converted " |
| 23 | self.assertEqual ( midi2note(midi), note ) | 22 | assert midi2note(midi) == (note) |
| 24 | 23 | ||
| 25 | class midi2note_wrong_values(unittest.TestCase): | 24 | class Test_midi2note_wrong_values: |
| 26 | 25 | ||
| 27 | def test_midi2note_negative_value(self): | 26 | def test_midi2note_negative_value(self): |
| 28 | " fails when passed a negative value " | 27 | " fails when passed a negative value " |
| 29 | self.assertRaises(ValueError, midi2note, -2) | 28 | assert_raises(ValueError, midi2note, -2) |
| 30 | 29 | ||
| 31 | def test_midi2note_large(self): | 30 | def test_midi2note_large(self): |
| 32 | " fails when passed a value greater than 127 " | 31 | " fails when passed a value greater than 127 " |
| 33 | self.assertRaises(ValueError, midi2note, 128) | 32 | assert_raises(ValueError, midi2note, 128) |
| 34 | 33 | ||
| 35 | def test_midi2note_floating_value(self): | 34 | def test_midi2note_floating_value(self): |
| 36 | " fails when passed a floating point " | 35 | " fails when passed a floating point " |
| 37 | self.assertRaises(TypeError, midi2note, 69.2) | 36 | assert_raises(TypeError, midi2note, 69.2) |
| 38 | 37 | ||
| 39 | def test_midi2note_character_value(self): | 38 | def test_midi2note_character_value(self): |
| 40 | " fails when passed a value that can not be transformed to integer " | 39 | " fails when passed a value that can not be transformed to integer " |
| 41 | self.assertRaises(TypeError, midi2note, "a") | 40 | assert_raises(TypeError, midi2note, "a") |
| 42 | 41 | ||
| 43 | if __name__ == '__main__': | 42 | if __name__ == '__main__': |
| 44 | import nose2 | 43 | from unittest import main |
| 45 | nose2.main() | 44 | main() |