Changes in python/tests/test_note2midi.py [7fd92ca:27ed546]

File:

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

python/tests/test_note2midi.py

@@ -5 +5 @@
 
 from aubio import note2midi, freq2note, note2freq, float_type
-from numpy.testing import TestCase
-from _tools import parametrize, assert_raises, skipTest
+from nose2.tools import params
+import unittest
 
 list_of_known_notes = (
@@ -45 +45 @@
         )
 
-class Test_note2midi_good_values(object):
+class note2midi_good_values(unittest.TestCase):
 
-    @parametrize('note, midi', list_of_known_notes)
+    @params(*list_of_known_notes)
     def test_note2midi_known_values(self, note, midi):
         " known values are correctly converted "
-        assert note2midi(note) == midi
+        self.assertEqual ( note2midi(note), midi )
 
-    @parametrize('note, midi', list_of_known_notes_with_unicode_issues)
+    @params(*list_of_known_notes_with_unicode_issues)
     def test_note2midi_known_values_with_unicode_issues(self, note, midi):
-        " difficult values are correctly converted unless expected failure "
+        " known values are correctly converted, unless decoding is expected to fail"
         try:
-            assert note2midi(note) == midi
+            self.assertEqual ( note2midi(note), midi )
         except UnicodeEncodeError as e:
-            # platforms with decoding failures include:
-            # - osx: python <= 2.7.10
-            # - win: python <= 2.7.12
             import sys
-            strmsg = "len(u'\\U0001D12A') != 1, expected decoding failure"
-            strmsg += " | upgrade to Python 3 to fix"
-            strmsg += " | {:s} | {:s} {:s}"
+            strfmt = "len(u'\\U0001D12A') != 1, excpected decoding failure | {:s} | {:s} {:s}"
+            strres = strfmt.format(e, sys.platform, sys.version)
+            # happens with: darwin 2.7.10, windows 2.7.12
             if len('\U0001D12A') != 1 and sys.version[0] == '2':
-                skipTest(strmsg.format(repr(e), sys.platform, sys.version))
+                self.skipTest(strres + " | upgrade to Python 3 to fix")
             else:
                 raise
 
-class note2midi_wrong_values(TestCase):
+class note2midi_wrong_values(unittest.TestCase):
 
     def test_note2midi_missing_octave(self):
@@ -108 +105 @@
         self.assertRaises(ValueError, note2midi, 'CB+-3')
 
-class Test_note2midi_unknown_values(object):
-
-    @parametrize('note', list_of_unknown_notes)
+    @params(*list_of_unknown_notes)
     def test_note2midi_unknown_values(self, note):
         " unknown values throw out an error "
-        assert_raises(ValueError, note2midi, note)
+        self.assertRaises(ValueError, note2midi, note)
 
-class freq2note_simple_test(TestCase):
+class freq2note_simple_test(unittest.TestCase):
 
     def test_freq2note_above(self):
@@ -125 +120 @@
         self.assertEqual("A4", freq2note(439))
 
-class note2freq_simple_test(TestCase):
+class note2freq_simple_test(unittest.TestCase):
 
     def test_note2freq(self):
@@ -139 +134 @@
 
 if __name__ == '__main__':
-    from _tools import run_module_suite
-    run_module_suite()
+    import nose2
+    nose2.main()