Update tests for plot updates

Author: TomDonoghue

fooof/tests/test_plts_spectra.py

@@ -9,13 +9,27 @@
 @plot_test
 def test_plot_spectrum(tfm, skip_if_no_mpl):
 
-    plot_spectrum(tfm.freqs, tfm.power_spectrum, True)
+    plot_spectrum(tfm.freqs, tfm.power_spectrum)
+
+    # Test with logging both axes
+    plot_spectrum(tfm.freqs, tfm.power_spectrum, True, True)
 
 @plot_test
 def test_plot_spectra(tfg, skip_if_no_mpl):
 
+    # Test with 1d inputs - 1d freq array and list of 1d power spectra
     plot_spectra(tfg.freqs, [tfg.power_spectra[0, :], tfg.power_spectra[1, :]])
 
+    # Test with multiple freq inputs - list of 1d freq array and list of 1d power spectra
+    plot_spectra([tfg.freqs, tfg.freqs], [tfg.power_spectra[0, :], tfg.power_spectra[1, :]])
+
+    # Test with 2d array inputs
+    plot_spectra(np.vstack([tfg.freqs, tfg.freqs]),
+                 np.vstack([tfg.power_spectra[0, :], tfg.power_spectra[1, :]]))
+
+    # Test with labels
+    plot_spectra(tfg.freqs, [tfg.power_spectra[0, :], tfg.power_spectra[1, :]], labels=['A', 'B'])
+
 @plot_test
 def test_plot_spectrum_shading(tfm, skip_if_no_mpl):
 
@@ -26,3 +40,8 @@ def test_plot_spectra_shading(tfg, skip_if_no_mpl):
 
     plot_spectra_shading(tfg.freqs, [tfg.power_spectra[0, :], tfg.power_spectra[1, :]],
                          shades=[8, 12], add_center=True)
+
+    # Test with **kwargs that pass into plot_spectra
+    plot_spectra_shading(tfg.freqs, [tfg.power_spectra[0, :], tfg.power_spectra[1, :]],
+                         shades=[8, 12], add_center=True, log_freqs=True, log_powers=True,
+                         labels=['A', 'B'])

fooof/tests/test_plts_styles.py

@@ -0,0 +1,29 @@
+"""Tests for fooof.plts.styles."""
+
+from fooof.plts.style import *
+
+###################################################################################################
+###################################################################################################
+
+def test_check_n_style(skip_if_no_mpl):
+
+    # Check can pass None and do nothing
+    check_n_style(None)
+    assert True
+
+    # Check can pass a callable
+    def checker(*args):
+        return True
+    check_n_style(checker)
+
+def test_style_spectrum_plot(skip_if_no_mpl):
+
+    # Create a dummy plot and style it
+    from fooof.core.modutils import safe_import
+    plt = safe_import('.pyplot', 'matplotlib')
+    _, ax = plt.subplots()
+    style_spectrum_plot(ax, False, False)
+
+    # Check that axis labels are added - use as proxy that it ran correctly
+    assert ax.xaxis.get_label().get_text()
+    assert ax.yaxis.get_label().get_text()