Remove duplicate test and parametrize test

dstansby · dstansby · commit 2e854aa95627 · 2017-08-05T17:23:41.000+01:00
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2786,35 +2786,16 @@ def test_hist_stacked_density():
     ax.hist((d1, d2), stacked=True, density=True)
 
 
-def test_hist_normed_density():
+@pytest.mark.parametrize('normed', [False, True])
+@pytest.mark.parametrize('density', [False, True])
+def test_hist_normed_density(normed, density):
     # Normed and density should not be used simultaneously
     d1 = np.linspace(1, 3, 20)
     d2 = np.linspace(0, 10, 50)
-    fig = plt.figure()
-    ax = fig.add_subplot(111)
+    fig, ax = plt.subplots()
     # test that kwargs normed and density cannot be set both.
     with pytest.raises(Exception):
-        ax.hist((d1, d2), stacked=True, normed=True, density=True)
-
-    with pytest.raises(Exception):
-        ax.hist((d1, d2), stacked=True, normed=False, density=True)
-
-    with pytest.raises(Exception):
-        ax.hist((d1, d2), stacked=True, normed=False, density=False)
-
-    with pytest.raises(Exception):
-        ax.hist((d1, d2), stacked=True, normed=True, density=False)
-
-
-def test_hist_stacked_density():
-    # make some data
-    d1 = np.linspace(1, 3, 20)
-    d2 = np.linspace(0, 10, 50)
-    fig, ax = plt.subplots()
-    ax.hist((d1, d2), stacked=True, density=True)
-
-    with pytest.raises(ValueError):
-        ax.hist((d1, d2), stacked=True, density=True, normed=False)
+        ax.hist((d1, d2), stacked=True, normed=normed, density=density)
 
 
 @image_comparison(baseline_images=['hist_step_bottom'], extensions=['png'],
