Changeset f264b17 for python/tests/test_note2midi.py

Timestamp:

Jun 22, 2016, 1:00:10 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, pitchshift, sampler, timestretch, yinfft+

Children:

4b9443c4

Parents:

60fc05b (diff), 6769586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into notes

File:

• python/tests/test_note2midi.py (modified) (4 diffs)

python/tests/test_note2midi.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-from aubio import note2midi
+from __future__ import unicode_literals
+
+from aubio import note2midi, freq2note
 import unittest
 
@@ -15 +17 @@
         ( 'A#4', 70 ),
         ( 'Bb4', 70 ),
-        ( u'B♭4', 70 ),
+        ( 'B♭4', 70 ),
         ( 'G8', 115 ),
-        ( u'G♯8', 116 ),
+        ( 'G♯8', 116 ),
         ( 'G9', 127 ),
-        ( u'G\udd2a2', 45 ),
-        ( u'B\ufffd2', 45 ),
-        ( u'A♮2', 45 ),
+        ( 'G\udd2a2', 45 ),
+        ( 'B\ufffd2', 45 ),
+        ( 'A♮2', 45 ),
         )
 
@@ -50 +52 @@
 
     def test_note2midi_out_of_range(self):
-        " fails when passed a out of range note"
+        " fails when passed a note out of range"
         self.assertRaises(ValueError, note2midi, 'A9')
+
+    def test_note2midi_wrong_note_name(self):
+        " fails when passed a note with a wrong name"
+        self.assertRaises(ValueError, note2midi, 'W9')
+
+    def test_note2midi_low_octave(self):
+        " fails when passed a note with a too low octave"
+        self.assertRaises(ValueError, note2midi, 'C-9')
 
     def test_note2midi_wrong_data_type(self):
@@ -57 +67 @@
         self.assertRaises(TypeError, note2midi, 123)
 
+
+class freq2note_simple_test(unittest.TestCase):
+
+    def test_freq2note(self):
+        " make sure freq2note(441) == A4 "
+        self.assertEqual("A4", freq2note(441))
+
 if __name__ == '__main__':
     unittest.main()