fix the other tests

nschloe · nschloe · commit be531ed6a3da · 2017-05-31T14:47:07.000+02:00
diff --git a/test/test_annotate.py b/test/test_annotate.py
@@ -38,4 +38,4 @@ def plot():
 
 def test():
     phash = Phash(plot())
-    assert phash.phash == 'ab8a79a1549654bg', phash.get_details()
+    assert phash.phash == 'ab8a79a1549654be', phash.get_details()
diff --git a/test/test_barchart.py b/test/test_barchart.py
@@ -5,7 +5,7 @@
 rectangle patches witch are difficult to tell from other rectangle
 patches that should not be plotted in PGFPlots (e.g. axis, legend)
 '''
-from helpers import assert_phash
+from helpers import Phash
 
 
 def plot():
@@ -30,4 +30,5 @@ def plot():
 
 
 def test():
-    assert_phash(plot(), '5f09a9e6b172874a')
+    phash = Phash(plot())
+    assert phash.phash == '5f09a9e6b172874a', phash.get_details()
diff --git a/test/test_basic_sin.py b/test/test_basic_sin.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from helpers import assert_phash
+from helpers import Phash
 
 from matplotlib import pyplot as plt
 from matplotlib import style
@@ -25,4 +25,5 @@ def plot():
 
 
 def test():
-    assert_phash(plot(), '1f86e1f521c6e5c1')
+    phash = Phash(plot())
+    assert phash.phash == '1f86e1f521c6e5c1', phash.get_details()
diff --git a/test/test_boxplot.py b/test/test_boxplot.py
@@ -7,7 +7,7 @@
 external data in the file '' or '.tex')
 See: https://github.com/nschloe/matplotlib2tikz/pull/134
 '''
-import helpers
+from helpers import Phash
 
 
 def plot():
@@ -50,4 +50,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '6be3e6b95e8000de')
+    phash = Phash(plot())
+    assert phash.phash == '6be3e6b95e8000de', phash.get_details()
diff --git a/test/test_colorbars.py b/test/test_colorbars.py
@@ -84,4 +84,5 @@ def plot():
 
 
 # def test():
-#     helpers.assert_phash(plot(), '')
+#     phash = Phash(plot())
+#     assert phash.phash == '6be3e6b95e8000de', phash.get_details()
diff --git a/test/test_dual_axis.py b/test/test_dual_axis.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-import helpers
+from helpers import Phash
 
 
 def plot():
@@ -18,4 +18,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '5382544c16bdde75')
+    phash = Phash(plot())
+    assert phash.phash == '5382544c16bdde75', phash.get_details()
diff --git a/test/test_errorband.py b/test/test_errorband.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-import helpers
+from helpers import Phash
 
 
 def plot():
@@ -22,4 +22,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'af2cd5922172772c')
+    phash = Phash(plot())
+    assert phash.phash == 'af2cd5922172772c', phash.get_details()
diff --git a/test/test_errorbar.py b/test/test_errorbar.py
@@ -20,4 +20,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'a3435e25bea866b8')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'a3435e25bea866b8', phash.get_details()
diff --git a/test/test_fancy_colorbar.py b/test/test_fancy_colorbar.py
@@ -20,4 +20,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'b733c9fc03dc4942')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'b733c9fc03dc4942', phash.get_details()
diff --git a/test/test_fancybox.py b/test/test_fancybox.py
@@ -192,7 +192,8 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '9d2327dc23cdd81a')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '9d2327dc23cdd81a', phash.get_details()
 
 
 if __name__ == '__main__':
diff --git a/test/test_fillstyle.py b/test/test_fillstyle.py
@@ -17,4 +17,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'a103fa09ee613e9e')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'a103fa09ee613e9e', phash.get_details()
diff --git a/test/test_heat.py b/test/test_heat.py
@@ -19,4 +19,5 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'fda6837883788378')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'fda6837883788378', phash.get_details()
diff --git a/test/test_image_plot.py b/test/test_image_plot.py
@@ -57,5 +57,6 @@ def plot2():
     ]
     )
 def test(plot, phash):
-    helpers.assert_phash(plot(), phash)
+    phash = helpers.Phash(plot())
+    assert phash.phash == phash, phash.get_details()
     return
diff --git a/test/test_legend_best_location.py b/test/test_legend_best_location.py
@@ -56,4 +56,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '879d991d2c877c1c')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '879d991d2c877c1c', phash.get_details()
+    return
diff --git a/test/test_legends.py b/test/test_legends.py
@@ -30,4 +30,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '7f7ca18386d10eaa')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '7f7ca18386d10eaa', phash.get_details()
+    return
diff --git a/test/test_legends2.py b/test/test_legends2.py
@@ -31,4 +31,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '6b447a5a62d4952f')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '6b447a5a62d4952f', phash.get_details()
+    return
diff --git a/test/test_line_collection.py b/test/test_line_collection.py
@@ -53,4 +53,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '5356a5adac9cac62')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '5356a5adac9cac62', phash.get_details()
+    return
diff --git a/test/test_loglogplot.py b/test/test_loglogplot.py
@@ -14,4 +14,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'abc35ec96e21be80')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'abc35ec96e21be80', phash.get_details()
+    return
diff --git a/test/test_logplot.py b/test/test_logplot.py
@@ -17,4 +17,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'e9e25eea7eea1400')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'e9e25eea7eea1400', phash.get_details()
+    return
diff --git a/test/test_marker.py b/test/test_marker.py
@@ -23,4 +23,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'ff2c47a6a1564545')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'ff2c47a6a1564545', phash.get_details()
+    return
diff --git a/test/test_noise.py b/test/test_noise.py
@@ -51,7 +51,8 @@ def plot2():
     ]
     )
 def test(plot, phash):
-    helpers.assert_phash(plot(), phash)
+    phash = helpers.Phash(plot())
+    assert phash.phash == phash, phash.get_details()
     return
 
 
diff --git a/test/test_patches.py b/test/test_patches.py
@@ -84,4 +84,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '7ff8494a87627116')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '7ff8494a87627116', phash.get_details()
+    return
diff --git a/test/test_quadmesh.py b/test/test_quadmesh.py
@@ -35,4 +35,6 @@ def v(x, y, t):
 
 
 def test():
-    helpers.assert_phash(plot(), '7f1a8578498579b2')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '7f1a8578498579b2', phash.get_details()
+    return
diff --git a/test/test_rotated_labels.py b/test/test_rotated_labels.py
@@ -70,6 +70,7 @@ def test_rotated_labels_parameters(x_alignment, y_alignment,
 
     # delete file
     os.unlink(tikz_file)
+    return
 
 
 @pytest.mark.parametrize("x_tick_label_width, y_tick_label_width", [
@@ -109,6 +110,7 @@ def test_rotated_labels_parameters_different_values(x_tick_label_width,
 
     # delete file
     os.unlink(tikz_file)
+    return
 
 
 def test_rotated_labels_parameters_no_ticks():
diff --git a/test/test_scatter.py b/test/test_scatter.py
@@ -18,4 +18,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '7f425b584d603f85')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '7f425b584d603f85', phash.get_details()
+    return
diff --git a/test/test_scatter_colormap.py b/test/test_scatter_colormap.py
@@ -18,4 +18,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'cb616c42e5ec738c')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'cb616c42e5ec738c', phash.get_details()
+    return
diff --git a/test/test_sharex_and_y.py b/test/test_sharex_and_y.py
@@ -19,4 +19,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '9bcdbc02ff919812')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '9bcdbc02ff919812', phash.get_details()
+    return
diff --git a/test/test_subplot4x4.py b/test/test_subplot4x4.py
@@ -37,4 +37,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'ab9c3f52dadc0303')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'ab9c3f52dadc0303', phash.get_details()
+    return
diff --git a/test/test_subplots.py b/test/test_subplots.py
@@ -36,4 +36,6 @@ def f(t):
 
 
 def test():
-    helpers.assert_phash(plot(), '1f21c53639de26c6')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '1f21c53639de26c6', phash.get_details()
+    return
diff --git a/test/test_subplots_with_colorbars.py b/test/test_subplots_with_colorbars.py
@@ -25,4 +25,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '6bc42fd06a95c03f')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '6bc42fd06a95c03f', phash.get_details()
+    return
diff --git a/test/test_text_overlay.py b/test/test_text_overlay.py
@@ -94,7 +94,9 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '370da93449d3f64c')
+    phash = helpers.Phash(plot())
+    assert phash.phash == '370da93449d3f64c', phash.get_details()
+    return
 
 
 if __name__ == '__main__':
diff --git a/test/test_tick_positions.py b/test/test_tick_positions.py
@@ -95,4 +95,6 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'cfa200af41ef40ef')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'cfa200af41ef40ef', phash.get_details()
+    return
diff --git a/test/test_viridis.py b/test/test_viridis.py
@@ -19,7 +19,9 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), 'fd7e03fc03bc0381')
+    phash = helpers.Phash(plot())
+    assert phash.phash == 'fd7e03fc03bc0381', phash.get_details()
+    return
 
 
 if __name__ == '__main__':
