Changeset d554321 for python/tests

Timestamp:

Dec 2, 2016, 1:44:12 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler, yinfft+

Children:

3aad0b1

Parents:

473ab11

Message:

python/tests/test_{midi2note,note2midi}.py: use nose2.params, add unicode tests

Location:

python/tests

Files:

• test_midi2note.py (modified) (3 diffs)
• test_note2midi.py (modified) (4 diffs)

python/tests/test_midi2note.py

@@ -3 +3 @@
 
 from aubio import midi2note
+from nose2.tools import params
 import unittest
 
@@ -17 +18 @@
 class midi2note_good_values(unittest.TestCase):
 
-    def test_midi2note_known_values(self):
+    @params(*list_of_known_midis)
+    def test_midi2note_known_values(self, midi, note):
         " known values are correctly converted "
-        for midi, note in list_of_known_midis:
-            self.assertEqual ( midi2note(midi), note )
+        self.assertEqual ( midi2note(midi), note )
 
 class midi2note_wrong_values(unittest.TestCase):
@@ -41 +42 @@
 
 if __name__ == '__main__':
-    unittest.main()
+    import nose2
+    nose2.main()

python/tests/test_note2midi.py

@@ -5 +5 @@
 
 from aubio import note2midi, freq2note
+from nose2.tools import params
 import unittest
 
@@ -14 +15 @@
         ( 'B3', 59 ),
         ( 'B#3', 60 ),
+        ( 'C\u266f4', 61 ),
+        ( 'C\U0001D12A4', 62 ),
+        ( 'E\U0001D12B4', 62 ),
         ( 'A4', 69 ),
         ( 'A#4', 70 ),
@@ -28 +32 @@
 class note2midi_good_values(unittest.TestCase):
 
-    def test_note2midi_known_values(self):
+    @params(*list_of_known_notes)
+    def test_note2midi_known_values(self, note, midi):
         " known values are correctly converted "
-        for note, midi in list_of_known_notes:
-            self.assertEqual ( note2midi(note), midi )
+        self.assertEqual ( note2midi(note), midi )
 
 class note2midi_wrong_values(unittest.TestCase):
@@ -75 +79 @@
 
 if __name__ == '__main__':
-    unittest.main()
+    import nose2
+    nose2.main()