TST: move tests from test_figure to test_pyplot

tacaswell · tacaswell · commit 5d32ae01717b · 2021-02-10T23:54:02.000-05:00
This test is much more about pyplot that Figure
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -937,134 +937,3 @@ def test_subfigure_double():
     subfigsnest[1].supylabel('supylabel')
 
     axsRight = subfigs[1].subplots(2, 2)
-
-
-def test_axes_kwargs():
-    # plt.axes() always creates new axes, even if axes kwargs differ.
-    plt.figure()
-    ax = plt.axes()
-    ax1 = plt.axes()
-    assert ax is not None
-    assert ax1 is not ax
-    plt.close()
-
-    plt.figure()
-    ax = plt.axes(projection='polar')
-    ax1 = plt.axes(projection='polar')
-    assert ax is not None
-    assert ax1 is not ax
-    plt.close()
-
-    plt.figure()
-    ax = plt.axes(projection='polar')
-    ax1 = plt.axes()
-    assert ax is not None
-    assert ax1.name == 'rectilinear'
-    assert ax1 is not ax
-    plt.close()
-
-    # fig.add_axes() always creates new axes, even if axes kwargs differ.
-    fig = plt.figure()
-    ax = fig.add_axes([0, 0, 1, 1])
-    ax1 = fig.add_axes([0, 0, 1, 1])
-    assert ax is not None
-    assert ax1 is not ax
-    plt.close()
-
-    fig = plt.figure()
-    ax = fig.add_axes([0, 0, 1, 1], projection='polar')
-    ax1 = fig.add_axes([0, 0, 1, 1], projection='polar')
-    assert ax is not None
-    assert ax1 is not ax
-    plt.close()
-
-    fig = plt.figure()
-    ax = fig.add_axes([0, 0, 1, 1], projection='polar')
-    ax1 = fig.add_axes([0, 0, 1, 1])
-    assert ax is not None
-    assert ax1.name == 'rectilinear'
-    assert ax1 is not ax
-    plt.close()
-
-    # fig.add_subplot() always creates new axes, even if axes kwargs differ.
-    fig = plt.figure()
-    ax = fig.add_subplot(1, 1, 1)
-    ax1 = fig.add_subplot(1, 1, 1)
-    assert ax is not None
-    assert ax1 is not ax
-    plt.close()
-
-    fig = plt.figure()
-    ax = fig.add_subplot(1, 1, 1, projection='polar')
-    ax1 = fig.add_subplot(1, 1, 1, projection='polar')
-    assert ax is not None
-    assert ax1 is not ax
-    plt.close()
-
-    fig = plt.figure()
-    ax = fig.add_subplot(1, 1, 1, projection='polar')
-    ax1 = fig.add_subplot(1, 1, 1)
-    assert ax is not None
-    assert ax1.name == 'rectilinear'
-    assert ax1 is not ax
-    plt.close()
-
-    # plt.subplot() searches for axes with the same subplot spec, and if one
-    # exists, and the kwargs match returns it, create a new one if they do not
-    fig = plt.figure()
-    ax = plt.subplot(1, 2, 1)
-    ax1 = plt.subplot(1, 2, 1)
-    ax2 = plt.subplot(1, 2, 2)
-    # This will delete ax / ax1 as they fully overlap
-    ax3 = plt.subplot(1, 2, 1, projection='polar')
-    ax4 = plt.subplot(1, 2, 1, projection='polar')
-    assert ax is not None
-    assert ax1 is ax
-    assert ax2 is not ax
-    assert ax3 is not ax
-    assert ax3 is ax4
-
-    assert ax not in fig.axes
-    assert ax2 in fig.axes
-    assert ax3 in fig.axes
-
-    assert ax.name == 'rectilinear'
-    assert ax2.name == 'rectilinear'
-    assert ax3.name == 'polar'
-    plt.close()
-
-    # plt.gca() returns an existing axes, unless there were no axes.
-    plt.figure()
-    ax = plt.gca()
-    ax1 = plt.gca()
-    assert ax is not None
-    assert ax1 is ax
-    plt.close()
-
-    # plt.gca() raises a DeprecationWarning if called with kwargs.
-    plt.figure()
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax = plt.gca(projection='polar')
-    ax1 = plt.gca()
-    assert ax is not None
-    assert ax1 is ax
-    assert ax1.name == 'polar'
-    plt.close()
-
-    # plt.gca() ignores keyword arguments if an axes already exists.
-    plt.figure()
-    ax = plt.gca()
-    with pytest.warns(
-            MatplotlibDeprecationWarning,
-            match=r'Calling gca\(\) with keyword arguments was deprecated'):
-        ax1 = plt.gca(projection='polar')
-    assert ax is not None
-    assert ax1 is ax
-    assert ax1.name == 'rectilinear'
-    plt.close()
-
-    ax1 = plt.subplot(111, projection='polar')
-    ax2 = plt.subplot(111, polar=True)
-    assert ax1 is ax2
diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py
@@ -170,3 +170,134 @@ def test_subplot_reuse():
     assert ax2 is plt.gca()
     ax1 = plt.subplot(121)
     assert ax1 is plt.gca()
+
+
+def test_axes_kwargs():
+    # plt.axes() always creates new axes, even if axes kwargs differ.
+    plt.figure()
+    ax = plt.axes()
+    ax1 = plt.axes()
+    assert ax is not None
+    assert ax1 is not ax
+    plt.close()
+
+    plt.figure()
+    ax = plt.axes(projection='polar')
+    ax1 = plt.axes(projection='polar')
+    assert ax is not None
+    assert ax1 is not ax
+    plt.close()
+
+    plt.figure()
+    ax = plt.axes(projection='polar')
+    ax1 = plt.axes()
+    assert ax is not None
+    assert ax1.name == 'rectilinear'
+    assert ax1 is not ax
+    plt.close()
+
+    # fig.add_axes() always creates new axes, even if axes kwargs differ.
+    fig = plt.figure()
+    ax = fig.add_axes([0, 0, 1, 1])
+    ax1 = fig.add_axes([0, 0, 1, 1])
+    assert ax is not None
+    assert ax1 is not ax
+    plt.close()
+
+    fig = plt.figure()
+    ax = fig.add_axes([0, 0, 1, 1], projection='polar')
+    ax1 = fig.add_axes([0, 0, 1, 1], projection='polar')
+    assert ax is not None
+    assert ax1 is not ax
+    plt.close()
+
+    fig = plt.figure()
+    ax = fig.add_axes([0, 0, 1, 1], projection='polar')
+    ax1 = fig.add_axes([0, 0, 1, 1])
+    assert ax is not None
+    assert ax1.name == 'rectilinear'
+    assert ax1 is not ax
+    plt.close()
+
+    # fig.add_subplot() always creates new axes, even if axes kwargs differ.
+    fig = plt.figure()
+    ax = fig.add_subplot(1, 1, 1)
+    ax1 = fig.add_subplot(1, 1, 1)
+    assert ax is not None
+    assert ax1 is not ax
+    plt.close()
+
+    fig = plt.figure()
+    ax = fig.add_subplot(1, 1, 1, projection='polar')
+    ax1 = fig.add_subplot(1, 1, 1, projection='polar')
+    assert ax is not None
+    assert ax1 is not ax
+    plt.close()
+
+    fig = plt.figure()
+    ax = fig.add_subplot(1, 1, 1, projection='polar')
+    ax1 = fig.add_subplot(1, 1, 1)
+    assert ax is not None
+    assert ax1.name == 'rectilinear'
+    assert ax1 is not ax
+    plt.close()
+
+    # plt.subplot() searches for axes with the same subplot spec, and if one
+    # exists, and the kwargs match returns it, create a new one if they do not
+    fig = plt.figure()
+    ax = plt.subplot(1, 2, 1)
+    ax1 = plt.subplot(1, 2, 1)
+    ax2 = plt.subplot(1, 2, 2)
+    # This will delete ax / ax1 as they fully overlap
+    ax3 = plt.subplot(1, 2, 1, projection='polar')
+    ax4 = plt.subplot(1, 2, 1, projection='polar')
+    assert ax is not None
+    assert ax1 is ax
+    assert ax2 is not ax
+    assert ax3 is not ax
+    assert ax3 is ax4
+
+    assert ax not in fig.axes
+    assert ax2 in fig.axes
+    assert ax3 in fig.axes
+
+    assert ax.name == 'rectilinear'
+    assert ax2.name == 'rectilinear'
+    assert ax3.name == 'polar'
+    plt.close()
+
+    # plt.gca() returns an existing axes, unless there were no axes.
+    plt.figure()
+    ax = plt.gca()
+    ax1 = plt.gca()
+    assert ax is not None
+    assert ax1 is ax
+    plt.close()
+
+    # plt.gca() raises a DeprecationWarning if called with kwargs.
+    plt.figure()
+    with pytest.warns(
+            MatplotlibDeprecationWarning,
+            match=r'Calling gca\(\) with keyword arguments was deprecated'):
+        ax = plt.gca(projection='polar')
+    ax1 = plt.gca()
+    assert ax is not None
+    assert ax1 is ax
+    assert ax1.name == 'polar'
+    plt.close()
+
+    # plt.gca() ignores keyword arguments if an axes already exists.
+    plt.figure()
+    ax = plt.gca()
+    with pytest.warns(
+            MatplotlibDeprecationWarning,
+            match=r'Calling gca\(\) with keyword arguments was deprecated'):
+        ax1 = plt.gca(projection='polar')
+    assert ax is not None
+    assert ax1 is ax
+    assert ax1.name == 'rectilinear'
+    plt.close()
+
+    ax1 = plt.subplot(111, projection='polar')
+    ax2 = plt.subplot(111, polar=True)
+    assert ax1 is ax2
