Showing the changes to python (2 of 2 files). Show all
Unified · Split
| @@ -2,6 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | # -*- coding: utf-8 -*- |
| 3 | 3 | |
| 4 | 4 | from aubio import midi2note |
| 5 | +from nose2.tools import params | |
| 5 | 6 | import unittest |
| 6 | 7 | |
| 7 | 8 | list_of_known_midis = ( |
| @@ -16,10 +17,10 @@ list_of_known_midis = ( · 8 unmodified lines | ||
| 16 | 17 | |
| 17 | 18 | class midi2note_good_values(unittest.TestCase): |
| 18 | 19 | |
| 19 | − def test_midi2note_known_values(self): | |
| 20 | + @params(*list_of_known_midis) | |
| 21 | + def test_midi2note_known_values(self, midi, note): | |
| 20 | 22 | " known values are correctly converted " |
| 21 | − for midi, note in list_of_known_midis: | |
| 22 | − self.assertEqual ( midi2note(midi), note ) | |
| 23 | + self.assertEqual ( midi2note(midi), note ) | |
| 23 | 24 | |
| 24 | 25 | class midi2note_wrong_values(unittest.TestCase): |
| 25 | 26 | |
| @@ -40,4 +41,5 @@ class midi2note_wrong_values(unittest.TestCase): · 14 unmodified lines | ||
| 40 | 41 | self.assertRaises(TypeError, midi2note, "a") |
| 41 | 42 | |
| 42 | 43 | if __name__ == '__main__': |
| 43 | − unittest.main() | |
| 44 | + import nose2 | |
| 45 | + nose2.main() | |
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | from __future__ import unicode_literals |
| 5 | 5 | |
| 6 | 6 | from aubio import note2midi, freq2note |
| 7 | +from nose2.tools import params | |
| 7 | 8 | import unittest |
| 8 | 9 | |
| 9 | 10 | list_of_known_notes = ( |
| @@ -13,6 +14,9 @@ list_of_known_notes = ( · 3 unmodified lines | ||
| 13 | 14 | ( 'C3', 48 ), |
| 14 | 15 | ( 'B3', 59 ), |
| 15 | 16 | ( 'B#3', 60 ), |
| 17 | + ( 'C\u266f4', 61 ), | |
| 18 | + ( 'C\U0001D12A4', 62 ), | |
| 19 | + ( 'E\U0001D12B4', 62 ), | |
| 16 | 20 | ( 'A4', 69 ), |
| 17 | 21 | ( 'A#4', 70 ), |
| 18 | 22 | ( 'Bb4', 70 ), |
| @@ -27,10 +31,10 @@ list_of_known_notes = ( · 8 unmodified lines | ||
| 27 | 31 | |
| 28 | 32 | class note2midi_good_values(unittest.TestCase): |
| 29 | 33 | |
| 30 | − def test_note2midi_known_values(self): | |
| 34 | + @params(*list_of_known_notes) | |
| 35 | + def test_note2midi_known_values(self, note, midi): | |
| 31 | 36 | " known values are correctly converted " |
| 32 | − for note, midi in list_of_known_notes: | |
| 33 | − self.assertEqual ( note2midi(note), midi ) | |
| 37 | + self.assertEqual ( note2midi(note), midi ) | |
| 34 | 38 | |
| 35 | 39 | class note2midi_wrong_values(unittest.TestCase): |
| 36 | 40 | |
| @@ -74,4 +78,5 @@ class freq2note_simple_test(unittest.TestCase): · 37 unmodified lines | ||
| 74 | 78 | self.assertEqual("A4", freq2note(441)) |
| 75 | 79 | |
| 76 | 80 | if __name__ == '__main__': |
| 77 | − unittest.main() | |
| 81 | + import nose2 | |
| 82 | + nose2.main() | |