-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added a get_points() and assert_points() function to the vector tester. * Added in get_points() and assert_points() functions with tests * Added proper documentation * Small fix to please codacy * black * Updated changelog * First round of tests for vector * black * Rough draft for bug fix * Fixed bug with multiple geometries plotted alongside bug with identical x values causing failure! * typo * Fixed small bug with markersize * Added comments explaining code * rough drafts of more tests * Added more tests for legends * Added more tests, and took out broken tests * small codacy fix * Fixed test! * Taking out redundant tests * Took out unneccesary tests * Added plt.close * Added more tests * Typo * more tests for uncovered parts of the vector file * black * Fixed issues with vector checking truth value of dataframe, and added tests * Fixing how vector checks for truth value of a dataframe * Added more coverage! * Broke tests up into individual files * black * Added tests for outlier cases * Update matplotcheck/tests/test_points.py typo Co-Authored-By: Leah Wasser <[email protected]> * took plt.gca() out of tests * Added changes suggested on GitHub * Update CHANGELOG.md * fix import order * import order fix * import order * import order Co-authored-by: Leah Wasser <[email protected]>
- Loading branch information
Showing
5 changed files
with
404 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| """Tests for the vector module""" | ||
| import matplotlib | ||
| import matplotlib.pyplot as plt | ||
| import pytest | ||
| import geopandas as gpd | ||
| from shapely.geometry import LineString | ||
|
|
||
| from matplotcheck.vector import VectorTester | ||
|
|
||
| matplotlib.use("Agg") | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def multi_line_gdf(two_line_gdf): | ||
| """ Create a multi-line GeoDataFrame. | ||
| This has one multi line and another regular line. | ||
| """ | ||
| # Create a single and multi line object | ||
| multiline_feat = two_line_gdf.unary_union | ||
| linec = LineString([(2, 1), (3, 1), (4, 1), (5, 2)]) | ||
| out_df = gpd.GeoDataFrame( | ||
| geometry=gpd.GeoSeries([multiline_feat, linec]), crs="epsg:4326", | ||
| ) | ||
| out_df["attr"] = ["road", "stream"] | ||
| return out_df | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def mixed_type_geo_plot(pd_gdf, multi_line_gdf): | ||
| """Create a point plot for testing""" | ||
| _, ax = plt.subplots() | ||
|
|
||
| pd_gdf.plot(ax=ax) | ||
| multi_line_gdf.plot(ax=ax) | ||
|
|
||
| return VectorTester(ax) | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def line_geo_plot(two_line_gdf): | ||
| """Create a line vector tester object.""" | ||
| _, ax = plt.subplots() | ||
|
|
||
| two_line_gdf.plot(ax=ax) | ||
|
|
||
| return VectorTester(ax) | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def multiline_geo_plot(multi_line_gdf): | ||
| """Create a multiline vector tester object.""" | ||
| _, ax = plt.subplots() | ||
|
|
||
| multi_line_gdf.plot(ax=ax, column="attr") | ||
|
|
||
| return VectorTester(ax) | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def multiline_geo_plot_bad(multi_line_gdf): | ||
| """Create a multiline vector tester object.""" | ||
| _, ax = plt.subplots() | ||
|
|
||
| multi_line_gdf.plot(ax=ax) | ||
|
|
||
| return VectorTester(ax) | ||
|
|
||
|
|
||
| def test_assert_line_geo(line_geo_plot, two_line_gdf): | ||
| """Test that lines are asserted correctly""" | ||
| line_geo_plot.assert_lines(two_line_gdf) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_multiline_geo(multiline_geo_plot, multi_line_gdf): | ||
| """Test that multi lines are asserted correctly""" | ||
| multiline_geo_plot.assert_lines(multi_line_gdf) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_line_geo_fail(line_geo_plot, multi_line_gdf): | ||
| """Test that lines fail correctly""" | ||
| with pytest.raises(AssertionError, match="Incorrect Line Data"): | ||
| line_geo_plot.assert_lines(multi_line_gdf) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_multiline_geo_fail(multiline_geo_plot, two_line_gdf): | ||
| """Test that multi lines fail correctly""" | ||
| with pytest.raises(AssertionError, match="Incorrect Line Data"): | ||
| multiline_geo_plot.assert_lines(two_line_gdf) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_line_fails_list(line_geo_plot): | ||
| """Test that assert_lines fails when passed a list""" | ||
| linelist = [ | ||
| [(1, 1), (2, 2), (3, 2), (5, 3)], | ||
| [(3, 4), (5, 7), (12, 2), (10, 5), (9, 7.5)], | ||
| ] | ||
| with pytest.raises(ValueError, match="lines_expected is not expected ty"): | ||
| line_geo_plot.assert_lines(linelist) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_line_geo_passed_nothing(line_geo_plot): | ||
| """Test that assertion passes when passed None""" | ||
| line_geo_plot.assert_lines(None) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_get_lines_geometry(line_geo_plot): | ||
| """Test that get_lines returns the proper values""" | ||
| lines = [(LineString(i[0])) for i in line_geo_plot.get_lines().values] | ||
| geometries = gpd.GeoDataFrame(geometry=lines) | ||
| line_geo_plot.assert_lines(geometries) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_lines_grouped_by_type(multiline_geo_plot, multi_line_gdf): | ||
| """Test that assert works for grouped line plots""" | ||
| multiline_geo_plot.assert_lines_grouped_by_type(multi_line_gdf, "attr") | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_lines_grouped_by_type_fail( | ||
| multiline_geo_plot_bad, multi_line_gdf | ||
| ): | ||
| """Test that assert fails for incorrectly grouped line plots""" | ||
| with pytest.raises(AssertionError, match="Line attributes not accurate "): | ||
| multiline_geo_plot_bad.assert_lines_grouped_by_type( | ||
| multi_line_gdf, "attr" | ||
| ) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_lines_grouped_by_type_passes_with_none(multiline_geo_plot): | ||
| """Test that assert passes if nothing is passed into it""" | ||
| multiline_geo_plot.assert_lines_grouped_by_type(None, None) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_assert_lines_grouped_by_type_fails_non_gdf( | ||
| multiline_geo_plot, multi_line_gdf | ||
| ): | ||
| """Test that assert fails if a list is passed into it""" | ||
| with pytest.raises(ValueError, match="lines_expected is not of expected "): | ||
| multiline_geo_plot.assert_lines_grouped_by_type( | ||
| multi_line_gdf.to_numpy(), "attr" | ||
| ) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_mixed_type_passes(mixed_type_geo_plot, pd_gdf): | ||
| """Tests that points passes with a mixed type plot""" | ||
| mixed_type_geo_plot.assert_points(pd_gdf) | ||
| plt.close("all") | ||
|
|
||
|
|
||
| def test_get_lines_by_collection(multiline_geo_plot): | ||
| """Test that get_lines_by_collection returns the correct values""" | ||
| lines_list = [ | ||
| [ | ||
| [(1, 1), (2, 2), (3, 2), (5, 3)], | ||
| [(3, 4), (5, 7), (12, 2), (10, 5), (9, 7.5)], | ||
| [(2, 1), (3, 1), (4, 1), (5, 2)], | ||
| ] | ||
| ] | ||
| sorted_lines_list = sorted([sorted(l) for l in lines_list]) | ||
| assert sorted_lines_list == multiline_geo_plot.get_lines_by_collection() | ||
| plt.close("all") |
Oops, something went wrong.