From da417e396087436d84d59e30cba4509b452a37f5 Mon Sep 17 00:00:00 2001 From: Ruoyi Date: Sat, 2 Dec 2023 17:05:55 -0500 Subject: [PATCH 1/3] Added test for fill_betweenx --- lib/matplotlib/tests/test_datetime.py | 36 ++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/tests/test_datetime.py b/lib/matplotlib/tests/test_datetime.py index 316be793e47c..bc2e5c2248f3 100644 --- a/lib/matplotlib/tests/test_datetime.py +++ b/lib/matplotlib/tests/test_datetime.py @@ -278,11 +278,41 @@ def test_fill_between(self): fig, ax = plt.subplots() ax.fill_between(...) - @pytest.mark.xfail(reason="Test for fill_betweenx not written yet") @mpl.style.context("default") def test_fill_betweenx(self): - fig, ax = plt.subplots() - ax.fill_betweenx(...) + mpl.rcParams["date.converter"] = "concise" + np.random.seed(19680801) + + x_base_date = datetime.datetime(2023, 1, 1) + x_dates1 = [x_base_date] + for i in range(1, 10): + x_base_date += datetime.timedelta(days=np.random.randint(1, 5)) + x_dates1.append(x_base_date) + + x_dates2 = [x_base_date] + for i in range(1, 10): + x_base_date += datetime.timedelta(days=np.random.randint(1, 5)) + x_dates2.append(x_base_date) + y_values = np.random.rand(10) * 10 + y_values.sort() + + x_values1 = np.random.rand(10) * 10 + x_values1.sort() + x_values2 = x_values1 + np.random.rand(10) * 10 + x_values2.sort() + + y_base_date = datetime.datetime(2023, 1, 1) + y_dates = [y_base_date] + for i in range(1, 10): + y_base_date += datetime.timedelta(days=np.random.randint(1, 10)) + y_dates.append(y_base_date) + + fig, (ax1, ax2, ax3, ax4) = plt.subplots(1, 4, layout="constrained") + + ax1.fill_betweenx(y_values, x_dates1, x_dates2) + ax2.fill_betweenx(y_values, x_values1, x_values2) + ax3.fill_betweenx(y_dates, x_values1, x_values2) + ax4.fill_betweenx(y_dates, x_dates1, x_dates2) @pytest.mark.xfail(reason="Test for hexbin not written yet") @mpl.style.context("default") From 3e5f6a98abdad10025046274782ce4a823d0f424 Mon Sep 17 00:00:00 2001 From: Ruoyi Date: Sat, 2 Dec 2023 18:35:56 -0500 Subject: [PATCH 2/3] pull the newest update --- lib/matplotlib/tests/test_datetime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_datetime.py b/lib/matplotlib/tests/test_datetime.py index aaca3549a16e..b104f27f1a19 100644 --- a/lib/matplotlib/tests/test_datetime.py +++ b/lib/matplotlib/tests/test_datetime.py @@ -336,8 +336,8 @@ def test_fill_betweenx(self): y_values.sort() x_values1 = np.random.rand(10) * 10 - x_values1.sort() x_values2 = x_values1 + np.random.rand(10) * 10 + x_values1.sort() x_values2.sort() y_base_date = datetime.datetime(2023, 1, 1) From dac87b6593475b2275fdef6686e2c580a09b59c8 Mon Sep 17 00:00:00 2001 From: Ruoyi Date: Tue, 5 Dec 2023 21:27:39 -0500 Subject: [PATCH 3/3] Deleted the second figure and only leave datetime figures --- lib/matplotlib/tests/test_datetime.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/tests/test_datetime.py b/lib/matplotlib/tests/test_datetime.py index b104f27f1a19..40362ce2c9c7 100644 --- a/lib/matplotlib/tests/test_datetime.py +++ b/lib/matplotlib/tests/test_datetime.py @@ -346,12 +346,11 @@ def test_fill_betweenx(self): y_base_date += datetime.timedelta(days=np.random.randint(1, 10)) y_dates.append(y_base_date) - fig, (ax1, ax2, ax3, ax4) = plt.subplots(1, 4, layout="constrained") + fig, (ax1, ax2, ax3) = plt.subplots(1, 3, layout="constrained") ax1.fill_betweenx(y_values, x_dates1, x_dates2) - ax2.fill_betweenx(y_values, x_values1, x_values2) - ax3.fill_betweenx(y_dates, x_values1, x_values2) - ax4.fill_betweenx(y_dates, x_dates1, x_dates2) + ax2.fill_betweenx(y_dates, x_values1, x_values2) + ax3.fill_betweenx(y_dates, x_dates1, x_dates2) @pytest.mark.xfail(reason="Test for hexbin not written yet") @mpl.style.context("default")