Add image comparison test for bivariate

matplotlib · patniharshit · Jun 9, 2017 · Jun 9, 2017 · Jul 3, 2017 · Jul 9, 2017
commit 59f56af84f9b019ddcd3a6a06b35aa9c6521c548
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5150,7 +5150,8 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
                    "'mcolors.BivariateNorm'")
             raise ValueError(msg)
 
-        is_bivari = (X.ndim == 3 or X.shape[0] == 2)
+        temp = np.asarray(X)
+        is_bivari = (temp.ndim == 3 or temp.shape[0] == 2)
         if is_bivari:
             if cmap is None:
                 cmap = mcolors.BivariateColormap()

diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bivar_imshow.png b/lib/matplotlib/tests/baseline_images/test_axes/bivar_imshow.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bivar_pcolor.png b/lib/matplotlib/tests/baseline_images/test_axes/bivar_pcolor.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bivar_pcolorfast.png b/lib/matplotlib/tests/baseline_images/test_axes/bivar_pcolorfast.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bivar_pcolormesh.png b/lib/matplotlib/tests/baseline_images/test_axes/bivar_pcolormesh.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -28,6 +28,7 @@
 from numpy.testing import assert_allclose, assert_array_equal
 from matplotlib.cbook import IgnoredKeywordWarning
 from matplotlib.cbook._backports import broadcast_to
+from matplotlib.cbook import get_sample_data
 
 # Note: Some test cases are run twice: once normally and once with labeled data
 #       These two must be defined in the same test function or need to have
@@ -5271,3 +5272,30 @@ def test_twinx_knows_limits():
 def test_zero_linewidth():
     # Check that setting a zero linewidth doesn't error
     plt.plot([0, 1], [0, 1], ls='--', lw=0)
+
+
+@image_comparison(
+    baseline_images=['bivar_imshow', 'bivar_pcolor', 'bivar_pcolormesh',
+                     'bivar_pcolorfast'],
+    extensions=['png']
+)
+def test_bivariates():
+    air_temp = np.load(get_sample_data('air_temperature.npy'))
+    surf_pres = np.load(get_sample_data('surface_pressure.npy'))
+    bivariate = [air_temp, surf_pres]
+
+    fig1, ax1 = plt.subplots()
+    cax1 = ax1.imshow(bivariate)
+    cbar = fig1.colorbar(cax1, xlabel='air_temp', ylabel='surf_pres')
+
+    fig2, ax2 = plt.subplots()
+    cax2 = ax2.pcolor(bivariate)
+    cbar = fig2.colorbar(cax2, xlabel='air_temp', ylabel='surf_pres')
+
+    fig3, ax3 = plt.subplots()
+    cax3 = ax3.pcolormesh(bivariate)
+    cbar = fig3.colorbar(cax3, xlabel='air_temp', ylabel='surf_pres')
+
+    fig4, ax4 = plt.subplots()
+    cax4 = ax4.pcolorfast(bivariate)
+    cbar = fig4.colorbar(cax4, xlabel='air_temp', ylabel='surf_pres')