Changeset 0b6d23d for python/tests/test_musicutils.py

Timestamp:

May 16, 2016, 5:08:18 AM (9 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:

a6f9ebf

Parents:

58a5fb9

Message:

python/tests: fix most prospect warnings

File:

• python/tests/test_musicutils.py (modified) (8 diffs)

python/tests/test_musicutils.py

@@ -1 +1 @@
 #! /usr/bin/env python
 
+from unittest import main
+import numpy as np
 from numpy.testing import TestCase
 from numpy.testing.utils import assert_equal, assert_almost_equal
-from numpy import cos, arange
-from math import pi
-
 from aubio import window, level_lin, db_spl, silence_detection, level_detection
-
 from aubio import fvec, float_type
 
@@ -26 +24 @@
         size = 1024
         aubio_window = window("hanning", size)
-        numpy_window = .5 - .5 * cos(2. * pi * arange(size) / size)
+        numpy_window = .5 - .5 * np.cos(2. * np.pi * np.arange(size) / size)
         assert_almost_equal(aubio_window, numpy_window)
 
@@ -34 +32 @@
 
     def test_fail_not_fvec(self):
-        try:
+        with self.assertRaises(ValueError):
             level_lin("default")
-        except ValueError as e:
-            pass
-        else:
-            self.fail('non-number input phase does not raise a TypeError')
 
     def test_zeros_is_zeros(self):
@@ -45 +39 @@
 
     def test_minus_ones_is_one(self):
-        from numpy import ones
-        assert_equal(level_lin(-ones(1024, dtype = float_type)), 1.)
+        assert_equal(level_lin(-np.ones(1024, dtype = float_type)), 1.)
 
 class aubio_db_spl(TestCase):
@@ -53 +46 @@
 
     def test_fail_not_fvec(self):
-        try:
+        with self.assertRaises(ValueError):
             db_spl("default")
-        except ValueError as e:
-            pass
-        else:
-            self.fail('non-number input phase does not raise a TypeError')
 
     def test_zeros_is_inf(self):
-        from math import isinf
-        assert isinf(db_spl(fvec(1024)))
+        assert np.isinf(db_spl(fvec(1024)))
 
     def test_minus_ones_is_zero(self):
-        from numpy import ones
-        assert_equal(db_spl(-ones(1024, dtype = float_type)), 0.)
+        assert_equal(db_spl(-np.ones(1024, dtype = float_type)), 0.)
 
 class aubio_silence_detection(TestCase):
@@ -73 +60 @@
 
     def test_fail_not_fvec(self):
-        try:
+        with self.assertRaises(ValueError):
             silence_detection("default", -70)
-        except ValueError as e:
-            pass
-        else:
-            self.fail('non-number input phase does not raise a TypeError')
 
     def test_zeros_is_one(self):
-        from math import isinf
         assert silence_detection(fvec(1024), -70) == 1
 
@@ -93 +75 @@
 
     def test_fail_not_fvec(self):
-        try:
+        with self.assertRaises(ValueError):
             level_detection("default", -70)
-        except ValueError as e:
-            pass
-        else:
-            self.fail('non-number input phase does not raise a TypeError')
 
     def test_zeros_is_one(self):
-        from math import isinf
         assert level_detection(fvec(1024), -70) == 1
 
@@ -109 +86 @@
 
 if __name__ == '__main__':
-    from unittest import main
     main()