Fix legacy logplot tests

Author: theRealSuperMario

test/test_cleanfigure.py

@@ -33,45 +33,6 @@ def test_plot(self):
             assert numLinesRaw - numLinesClean == 18
         plt.close("all")
 
-    def test_logplot(self):
-        x = np.logspace(-3, 3, 20)
-        y = np.logspace(-3, 3, 20)
-
-        with plt.rc_context(rc=RC_PARAMS):
-            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
-            ax.plot(x, y)
-            ax.set_xscale("log")
-            ax.set_yscale("log")
-            ax.set_ylim([10 ** (-2), 10 ** (2)])
-            ax.set_xlim([10 ** (-2), 10 ** (2)])
-            raw = get_tikz_code()
-
-            clean_figure(fig)
-            clean = get_tikz_code()
-            numLinesRaw = raw.count("\n")
-            numLinesClean = clean.count("\n")
-            assert numLinesRaw - numLinesClean == 11
-        plt.close("all")
-
-    def test_semilogplot(self):
-        x = np.logspace(-3, 3, 20)
-        y = np.linspace(1, 100, 20)
-
-        with plt.rc_context(rc=RC_PARAMS):
-            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
-            ax.plot(x, y)
-            ax.set_xscale("log")
-            ax.set_xlim([10 ** (-2), 10 ** (2)])
-            ax.set_ylim([20, 80])
-            raw = get_tikz_code()
-
-            clean_figure(fig)
-            clean = get_tikz_code()
-            numLinesRaw = raw.count("\n")
-            numLinesClean = clean.count("\n")
-            assert numLinesRaw - numLinesClean == 6
-        plt.close("all")
-
     def test_step(self):
         x = np.linspace(1, 100, 20)
         y = np.linspace(1, 100, 20)
@@ -664,6 +625,45 @@ def test_loglog_2(self):
             assert numLinesClean == 27
         plt.close("all")
 
+    def test_loglog_3(self):
+        x = np.logspace(-3, 3, 20)
+        y = np.logspace(-3, 3, 20)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_yscale("log")
+            ax.set_ylim([10 ** (-2), 10 ** (2)])
+            ax.set_xlim([10 ** (-2), 10 ** (2)])
+            raw = get_tikz_code()
+
+            clean_figure(fig)
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 18
+        plt.close("all")
+
+    def test_xlog_3(self):
+        x = np.logspace(-3, 3, 20)
+        y = np.linspace(1, 100, 20)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_xlim([10 ** (-2), 10 ** (2)])
+            ax.set_ylim([20, 80])
+            raw = get_tikz_code()
+
+            clean_figure(fig)
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 18
+        plt.close("all")
+
 
 def test_memory():
     plt.plot(np.arange(100000))