Impoved testing

Author: rhshadrach

pandas/tests/plotting/common.py

@@ -337,13 +337,15 @@ def _check_axes_shape(self, axes, axes_num=None, layout=None, figsize=None):
         visible_axes = self._flatten_visible(axes)
 
         if axes_num is not None:
+            print(len(visible_axes), axes_num)
             assert len(visible_axes) == axes_num
             for ax in visible_axes:
                 # check something drawn on visible axes
                 assert len(ax.get_children()) > 0
 
         if layout is not None:
             result = self._get_axes_layout(_flatten(axes))
+            print(result, layout)
             assert result == layout
 
         tm.assert_numpy_array_equal(

pandas/tests/plotting/test_hist_method.py

@@ -269,6 +269,34 @@ def test_hist_subplot_xrot(self):
         )
         self._check_ticks_props(axes, xrot=0)
 
+    @pytest.mark.slow
+    @pytest.mark.parametrize("column", [None, "B"])
+    @pytest.mark.parametrize("label", [None, "D"])
+    def test_hist_with_legend(self, column, label):
+        kwargs = {'legend': True}
+        if label is not None:
+            kwargs['label'] = label
+        if column is not None:
+            kwargs['column'] = column
+
+        columns = ["A", "B"]
+        df = DataFrame(np.random.randn(30, 2), columns=columns)
+        df["C"] = 15 * ["a"] + 15 * ["b"]
+        df = df.set_index("C")
+        _check_plot_works(df.hist, **kwargs)
+        axes = df.hist(**kwargs)
+
+        axes_num = 2 if column is None else 1
+        layout = (1, 2) if column is None else (1, 1)
+        self._check_axes_shape(axes, axes_num=axes_num, layout=layout)
+
+        for labels, axis in zip(columns, axes[0]):
+            if column is not None:
+                labels = ["B"]
+            if label is not None:
+                labels = ["D"]
+            self._check_legend_labels([axis], labels)
+
 
 @td.skip_if_no_mpl
 class TestDataFrameGroupByPlots(TestPlotBase):
@@ -461,13 +489,27 @@ def test_axis_share_xy(self):
         assert ax1._shared_y_axes.joined(ax1, ax2)
         assert ax2._shared_y_axes.joined(ax1, ax2)
 
-
-@pytest.mark.slow
-@pytest.mark.parametrize("by", [None, "C"])
-@pytest.mark.parametrize("column", [None, "B"])
-@pytest.mark.parametrize("label", [None, "D"])
-def test_hist_with_legend(by, column, label):
-    df = DataFrame(np.random.randn(30, 2), columns=["A", "B"])
-    df["C"] = 15 * ["a"] + 15 * ["b"]
-    df = df.set_index("C")
-    _check_plot_works(df.hist, by=by, column=column, label=label, legend=True)
+    @pytest.mark.slow
+    @pytest.mark.parametrize("column", [None, "B"])
+    @pytest.mark.parametrize("label", [None, "D"])
+    def test_hist_with_legend(self, column, label):
+        kwargs = {'legend': True, "by": "C"}
+        if label is not None:
+            kwargs['label'] = label
+        if column is not None:
+            kwargs['column'] = column
+
+        columns = ["A", "B"]
+        df = DataFrame(np.random.randn(30, 2), columns=columns)
+        df["C"] = 15 * ["a"] + 15 * ["b"]
+        df = df.set_index("C")
+        _check_plot_works(df.hist, **kwargs)
+        axes = df.hist(**kwargs)
+
+        self._check_axes_shape(axes, axes_num=2, layout=(1, 2))
+        labels = columns
+        if column is not None:
+            labels = ["B"]
+        if label is not None:
+            labels = ["D"]
+        self._check_legend_labels(axes, labels)