remove duplicate tests

Author: ConorMacBride

tests/baseline/hashes/mpl20_ft261.json

@@ -6,34 +6,17 @@
 from unittest import TestCase
 
 import matplotlib
-import matplotlib.ft2font
 import matplotlib.pyplot as plt
 import pytest
 from helpers import skip_if_format_unsupported
-from packaging.version import Version
-
-MPL_VERSION = Version(matplotlib.__version__)
 
 baseline_dir = 'baseline'
-
-if MPL_VERSION >= Version('2'):
-    baseline_subdir = '2.0.x'
+baseline_subdir = '2.0.x'
 
 baseline_dir_local = os.path.join(baseline_dir, baseline_subdir)
 baseline_dir_remote = 'http://matplotlib.github.io/pytest-mpl/' + baseline_subdir + '/'
 
-ftv = matplotlib.ft2font.__freetype_version__.replace('.', '')
-hash_filename = f"mpl{MPL_VERSION.major}{MPL_VERSION.minor}_ft{ftv}.json"
-
-if "+" in matplotlib.__version__:
-    hash_filename = "mpldev.json"
-
-hash_library = (Path(__file__).parent / "baseline" /  # noqa
-                "hashes" / hash_filename)
-
-fail_hash_library = Path(__file__).parent / "baseline" / "test_hash_lib.json"
 baseline_dir_abs = Path(__file__).parent / "baseline" / baseline_subdir
-hash_baseline_dir_abs = Path(__file__).parent / "baseline" / "hybrid"
 
 
 WIN = sys.platform.startswith('win')
@@ -277,228 +260,6 @@ def test_succeeds(self):
         return fig
 
 
-# hashlib
-
-@pytest.mark.skipif(not hash_library.exists(), reason="No hash library for this mpl version")
-@pytest.mark.mpl_image_compare(hash_library=hash_library, deterministic=True)
-def test_hash_succeeds():
-    fig = plt.figure()
-    ax = fig.add_subplot(1, 1, 1)
-    ax.plot([1, 2, 3])
-    return fig
-
-
-TEST_FAILING_HASH = rf"""
-import pytest
-import matplotlib.pyplot as plt
-@pytest.mark.mpl_image_compare(hash_library=r"{fail_hash_library}", deterministic=True)
-def test_hash_fails():
-    fig = plt.figure()
-    ax = fig.add_subplot(1,1,1)
-    ax.plot([1,2,2])
-    return fig
-"""
-
-
-def test_hash_fails(tmp_path):
-    test_file = tmp_path / "test.py"
-    test_file.write_text(TEST_FAILING_HASH, encoding="ascii")
-    test_file = str(test_file)
-
-    # If we use --mpl, it should detect that the figure is wrong
-    output = assert_pytest_fails_with(['--mpl', test_file], "doesn't match hash FAIL in library")
-    # We didn't specify a baseline dir so we shouldn't attempt to find one
-    assert "Image file not found for comparison test" not in output, output
-
-    # Check that the summary path is printed and that it exists.
-    output = assert_pytest_fails_with(['--mpl', test_file, '--mpl-generate-summary=html'],
-                                      "doesn't match hash FAIL in library")
-    # We didn't specify a baseline dir so we shouldn't attempt to find one
-    print_message = "A summary of test results can be found at:"
-    assert print_message in output, output
-    printed_path = Path(output.split(print_message)[1].strip())
-    assert printed_path.exists()
-
-    # If we don't use --mpl option, the test should succeed
-    code = call_pytest([test_file])
-    assert code == 0
-
-
-TEST_FAILING_HYBRID = rf"""
-import pytest
-import matplotlib.pyplot as plt
-@pytest.mark.mpl_image_compare(hash_library=r"{fail_hash_library}",
-                               tolerance=2, deterministic=True)
-def test_hash_fail_hybrid():
-    fig = plt.figure()
-    ax = fig.add_subplot(1,1,1)
-    ax.plot([1,2,3])
-    return fig
-"""
-
-
-@pytest.mark.skipif(ftv != '261', reason="Incorrect freetype version for hash check")
-def test_hash_fail_hybrid(tmp_path):
-
-    test_file = tmp_path / "test.py"
-    test_file.write_text(TEST_FAILING_HYBRID, encoding="ascii")
-    test_file = str(test_file)
-
-    # Assert that image comparison runs and fails
-    output = assert_pytest_fails_with(['--mpl', test_file,
-                                       rf'--mpl-baseline-path={hash_baseline_dir_abs / "fail"}'],
-                                      "doesn't match hash FAIL in library")
-    assert "Error: Image files did not match." in output, output
-
-    # Assert reports missing baseline image
-    output = assert_pytest_fails_with(['--mpl', test_file,
-                                       '--mpl-baseline-path=/not/a/path'],
-                                      "doesn't match hash FAIL in library")
-    assert "Image file not found for comparison test" in output, output
-
-    # Assert reports image comparison succeeds
-    output = assert_pytest_fails_with(['--mpl', test_file,
-                                       rf'--mpl-baseline-path={hash_baseline_dir_abs / "succeed"}'],
-                                      "doesn't match hash FAIL in library")
-    assert "The comparison to the baseline image succeeded." in output, output
-
-    # If we don't use --mpl option, the test should succeed
-    code = call_pytest([test_file])
-    assert code == 0
-
-
-TEST_FAILING_NEW_HASH = r"""
-import pytest
-import matplotlib.pyplot as plt
-@pytest.mark.mpl_image_compare
-def test_hash_fails():
-    fig = plt.figure()
-    ax = fig.add_subplot(1,1,1)
-    ax.plot([1,2,2])
-    return fig
-"""
-
-
-@pytest.mark.skipif(ftv != '261', reason="Incorrect freetype version for hash check")
-def test_hash_fail_new_hashes(tmp_path):
-    # Check that the hash comparison fails even if a new hash file is requested
-    test_file = tmp_path / "test.py"
-    test_file.write_text(TEST_FAILING_NEW_HASH, encoding="ascii")
-    test_file = str(test_file)
-
-    # Assert that image comparison runs and fails
-    assert_pytest_fails_with(['--mpl', test_file,
-                              f'--mpl-hash-library={fail_hash_library}'],
-                             "doesn't match hash FAIL in library")
-
-    hash_file = tmp_path / "new_hashes.json"
-    # Assert that image comparison runs and fails
-    assert_pytest_fails_with(['--mpl', test_file,
-                              f'--mpl-hash-library={fail_hash_library}',
-                              f'--mpl-generate-hash-library={hash_file}'],
-                             "doesn't match hash FAIL")
-
-
-TEST_MISSING_HASH = """
-import pytest
-import matplotlib.pyplot as plt
-@pytest.mark.mpl_image_compare
-def test_hash_missing():
-    fig = plt.figure()
-    ax = fig.add_subplot(1,1,1)
-    ax.plot([1,2,2])
-    return fig
-"""
-
-
-def test_hash_missing(tmp_path):
-    test_file = tmp_path / "test.py"
-    test_file.write_text(TEST_MISSING_HASH)
-    test_file = str(test_file)
-
-    # Assert fails if hash library missing
-    assert_pytest_fails_with(['--mpl', test_file, '--mpl-hash-library=/not/a/path'],
-                             "Can't find hash library at path")
-
-    # Assert fails if hash not in library
-    assert_pytest_fails_with(['--mpl', test_file, f'--mpl-hash-library={fail_hash_library}'],
-                             "Hash for test 'test.test_hash_missing' not found in")
-
-    # If we don't use --mpl option, the test should succeed
-    code = call_pytest([test_file])
-    assert code == 0
-
-
-TEST_RESULTS_ALWAYS = """
-import pytest
-import matplotlib.pyplot as plt
-def plot():
-    fig = plt.figure()
-    ax = fig.add_subplot(1,1,1)
-    ax.plot([1,2,2])
-    return fig
-@pytest.mark.mpl_image_compare(deterministic=True)
-def test_modified(): return plot()
-@pytest.mark.mpl_image_compare(deterministic=True)
-def test_new(): return plot()
-@pytest.mark.mpl_image_compare(deterministic=True)
-def test_unmodified(): return plot()
-"""
-
-
-@pytest.mark.skipif(not hash_library.exists(), reason="No hash library for this mpl version")
-def test_results_always(tmp_path):
-    test_file = tmp_path / "test.py"
-    test_file.write_text(TEST_RESULTS_ALWAYS)
-    results_path = tmp_path / "results"
-    results_path.mkdir()
-
-    code = call_pytest(['--mpl', str(test_file), '--mpl-results-always',
-                        rf'--mpl-hash-library={hash_library}',
-                        rf'--mpl-baseline-path={baseline_dir_abs}',
-                        '--mpl-generate-summary=html,json,basic-html',
-                        rf'--mpl-results-path={results_path}'])
-    assert code == 0  # hashes correct, so all should pass
-
-    # assert files for interactive HTML exist
-    assert (results_path / "fig_comparison.html").exists()
-    assert (results_path / "styles.css").exists()
-    assert (results_path / "extra.js").exists()
-
-    html = (results_path / "fig_comparison_basic.html").read_text()
-    with (results_path / "results.json").open("r") as f:
-        json_results = json.load(f)
-
-    # each test, and which images should exist
-    for test, exists in [
-        ('test_modified', ['baseline', 'result-failed-diff', 'result']),
-        ('test_new', ['result']),
-        ('test_unmodified', ['baseline', 'result']),
-    ]:
-
-        test_name = f'test.{test}'
-
-        summary = f'<div class="test-name">{test_name.split(".")[-1]}</div>'
-        assert summary in html
-
-        assert test_name in json_results.keys()
-        json_res = json_results[test_name]
-        assert json_res['status'] == 'passed'
-
-        for image_type in ['baseline', 'result-failed-diff', 'result']:
-            image = f'{test_name}/{image_type}.png'
-            image_exists = (results_path / image).exists()
-            json_image_key = f"{image_type.split('-')[-1]}_image"
-            if image_type in exists:  # assert image so pytest prints it on error
-                assert image and image_exists
-                assert image in html
-                assert json_res[json_image_key] == image
-            else:
-                assert image and not image_exists
-                assert image not in html
-                assert json_res[json_image_key] is None
-
-
 TEST_FAILING_CLASS = """
 import pytest
 import matplotlib.pyplot as plt