Parametrize spectral tests by sides separately.

QuLogic · QuLogic · commit c86bcb14970a · 2017-06-01T20:45:36.000-04:00
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -1147,78 +1147,35 @@ def test_detrend_detrend_linear_1d_slope_off_axis1(self):
 
 @pytest.mark.parametrize('iscomplex', [False, True],
                          ids=['real', 'complex'], scope='class')
+@pytest.mark.parametrize('sides', ['onesided', 'twosided', 'default'],
+                         scope='class')
 @pytest.mark.parametrize(
-    'fstims,sides,len_x,NFFT_density,nover_density,'
-    'pad_to_density,pad_to_spectrum',
+    'fstims,len_x,NFFT_density,nover_density,pad_to_density,pad_to_spectrum',
     [
-        ([], 'onesided', None, -1, -1, -1, -1),
-        ([], 'twosided', None, -1, -1, -1, -1),
-        ([], 'default', None, -1, -1, -1, -1),
-        ([4], 'onesided', None, -1, -1, -1, -1),
-        ([4], 'twosided', None, -1, -1, -1, -1),
-        ([4], 'default', None, -1, -1, -1, -1),
-        ([4, 5, 10], 'onesided', None, -1, -1, -1, -1),
-        ([4, 5, 10], 'twosided', None, -1, -1, -1, -1),
-        ([4, 5, 10], 'default', None, -1, -1, -1, -1),
-        ([], 'onesided', None, None, -1, -1, None),
-        ([], 'twosided', None, None, -1, -1, None),
-        ([], 'default', None, None, -1, -1, None),
-        ([], 'onesided', None, -1, -1, None, None),
-        ([], 'twosided', None, -1, -1, None, None),
-        ([], 'default', None, -1, -1, None, None),
-        ([], 'onesided', None, None, -1, None, None),
-        ([], 'twosided', None, None, -1, None, None),
-        ([], 'default', None, None, -1, None, None),
-        ([], 'onesided', 1024, 512, -1, -1, 128),
-        ([], 'twosided', 1024, 512, -1, -1, 128),
-        ([], 'default', 1024, 512, -1, -1, 128),
-        ([], 'onesided', 256, -1, -1, 33, 257),
-        ([], 'twosided', 256, -1, -1, 33, 257),
-        ([], 'default', 256, -1, -1, 33, 257),
-        ([], 'onesided', 255, 33, -1, -1, None),
-        ([], 'twosided', 255, 33, -1, -1, None),
-        ([], 'default', 255, 33, -1, -1, None),
-        ([], 'onesided', 256, 128, -1, 256, 256),
-        ([], 'twosided', 256, 128, -1, 256, 256),
-        ([], 'default', 256, 128, -1, 256, 256),
-        ([], 'onesided', None, -1, 32, -1, -1),
-        ([], 'twosided', None, -1, 32, -1, -1),
-        ([], 'default', None, -1, 32, -1, -1),
+        ([], None, -1, -1, -1, -1),
+        ([4], None, -1, -1, -1, -1),
+        ([4, 5, 10], None, -1, -1, -1, -1),
+        ([], None, None, -1, -1, None),
+        ([], None, -1, -1, None, None),
+        ([], None, None, -1, None, None),
+        ([], 1024, 512, -1, -1, 128),
+        ([], 256, -1, -1, 33, 257),
+        ([], 255, 33, -1, -1, None),
+        ([], 256, 128, -1, 256, 256),
+        ([], None, -1, 32, -1, -1),
    ],
     ids=[
-        'nosig_onesided',
-        'nosig_twosided',
-        'nosig_defaultsided',
-        'Fs4_onesided',
-        'Fs4_twosided',
-        'Fs4_defaultsided',
-        'FsAll_onesided',
-        'FsAll_twosided',
-        'FsAll_defaultsided',
-        'nosig_onesided_noNFFT',
-        'nosig_twosided_noNFFT',
-        'nosig_defaultsided_noNFFT',
-        'nosig_onesided_nopad_to',
-        'nosig_twosided_nopad_to',
-        'nosig_defaultsided_nopad_to',
-        'nosig_onesided_noNFFT_no_pad_to',
-        'nosig_twosided_noNFFT_no_pad_to',
-        'nosig_defaultsided_noNFFT_no_pad_to',
-        'nosig_onesided_trim',
-        'nosig_twosided_trim',
-        'nosig_defaultsided_trim',
-        'nosig_onesided_odd',
-        'nosig_twosided_odd',
-        'nosig_defaultsided_odd',
-        'nosig_onesided_oddlen',
-        'nosig_twosided_oddlen',
-        'nosig_defaultsided_oddlen',
-        'nosig_onesided_stretch',
-        'nosig_twosided_stretch',
-        'nosig_defaultsided_stretch',
-        'nosig_onesided_overlap',
-        'nosig_twosided_overlap',
-        'nosig_defaultsided_overlap',
+        'nosig',
+        'Fs4',
+        'FsAll',
+        'nosig_noNFFT',
+        'nosig_nopad_to',
+        'nosig_noNFFT_no_pad_to',
+        'nosig_trim',
+        'nosig_odd',
+        'nosig_oddlen',
+        'nosig_stretch',
+        'nosig_overlap',
     ],
     scope='class')
 class TestSpectral(object):
