Changeset 67024ff

Timestamp:

Nov 2, 2018, 8:34:17 PM (6 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/timestretch, fix/ffmpeg5, master

Children:

8607a74

Parents:

5af36fa

Message:

[tests] capture warnings from filterbank_mel, improve coverage

Location:

python/tests

Files:

• test_filterbank_mel.py (modified) (4 diffs)
• test_source.py (modified) (1 diff)

python/tests/test_filterbank_mel.py

@@ -3 +3 @@
 import numpy as np
 from numpy.testing import TestCase, assert_equal, assert_almost_equal
+from _tools import assert_warns
 
 from aubio import cvec, filterbank, float_type
@@ -29 +30 @@
         freq_list = [40, 80, 200, 400, 800, 1600, 3200, 6400, 12800, 15000, 24000]
         freqs = np.array(freq_list, dtype = float_type)
-        f.set_triangle_bands(freqs, 48000)
+        with assert_warns(UserWarning):
+            f.set_triangle_bands(freqs, 48000)
         assert_equal ( f(cvec(1024)), 0)
         self.assertIsInstance(f.get_coeffs(), np.ndarray)
@@ -37 +39 @@
         freq_list = [40, 80, 200, 400, 800, 1600, 3200, 6400, 12800, 15000, 24000]
         freqs = np.array(freq_list, dtype = float_type)
-        f.set_triangle_bands(freqs, 48000)
+        with assert_warns(UserWarning):
+            f.set_triangle_bands(freqs, 48000)
         self.assertIsInstance(f.get_coeffs(), np.ndarray)
         spec = cvec(1024)
@@ -45 +48 @@
                     0.02133301, 0.02133301, 0.02133311, 0.02133334, 0.02133345])
 
+    def test_triangle_freqs_normal(self):
+        """ create a filter with set_triangle_bands, normal mode """
+        f = filterbank(3, 1024)
+        freq_list = [100, 1000, 10000, 15000, 20000]
+        freqs = np.array(freq_list, dtype = float_type)
+        f.set_triangle_bands(freqs, 44100)
+
+    def test_triangle_freqs_too_long(self):
+        """ create a filter with freq_list too long """
+        f = filterbank(2, 1024)
+        freq_list = [100, 1000, 10000, 15000, 20000]
+        freqs = np.array(freq_list, dtype = float_type)
+        with assert_warns(UserWarning):
+            f.set_triangle_bands(freqs, 44100)
+
+    def test_triangle_freqs_too_short(self):
+        """ create a filter with freq_list too short """
+        f = filterbank(4, 1024)
+        freq_list = [100, 1000, 10000, 15000, 20000]
+        freqs = np.array(freq_list, dtype = float_type)
+        with assert_warns(UserWarning):
+            f.set_triangle_bands(freqs, 44100)
+
+    def test_above_nyquist(self):
+        """ create a filter with freq_list too short """
+        f = filterbank(3, 1024)
+        freq_list = [100, 1000, 10000, 15000, 23000]
+        freqs = np.array(freq_list, dtype = float_type)
+        with assert_warns(UserWarning):
+            f.set_triangle_bands(freqs, 44100)
+
 if __name__ == '__main__':
     from unittest import main

python/tests/test_source.py

@@ -70 +70 @@
         if 'f_' in soundfile and samplerate == 0:
             import re
-            f = re.compile('.*_\([0:9]*f\)_.*')
+            f = re.compile(r'.*_\([0:9]*f\)_.*')
             match_f = re.findall('([0-9]*)f_', soundfile)
             if len(match_f) == 1: