diff --git a/test/data/cairo_1.18.0/test_attribution.png b/test/data/cairo_1.18.0/test_attribution.png deleted file mode 100644 index a370b32..0000000 Binary files a/test/data/cairo_1.18.0/test_attribution.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_symbol_layer.png b/test/data/cairo_1.18.0/test_symbol_layer.png deleted file mode 100644 index ed70570..0000000 Binary files a/test/data/cairo_1.18.0/test_symbol_layer.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_bottom-left.png b/test/data/cairo_1.18.0/test_text_anchor_bottom-left.png deleted file mode 100644 index faca1bc..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_bottom-left.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_bottom-right.png b/test/data/cairo_1.18.0/test_text_anchor_bottom-right.png deleted file mode 100644 index 3e05c20..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_bottom-right.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_bottom.png b/test/data/cairo_1.18.0/test_text_anchor_bottom.png deleted file mode 100644 index dd7337c..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_bottom.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_center.png b/test/data/cairo_1.18.0/test_text_anchor_center.png deleted file mode 100644 index 9cf650b..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_center.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_left.png b/test/data/cairo_1.18.0/test_text_anchor_left.png deleted file mode 100644 index e9dce7a..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_left.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_right.png b/test/data/cairo_1.18.0/test_text_anchor_right.png deleted file mode 100644 index 6b19424..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_right.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_top-left.png b/test/data/cairo_1.18.0/test_text_anchor_top-left.png deleted file mode 100644 index 38820d6..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_top-left.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_top-right.png b/test/data/cairo_1.18.0/test_text_anchor_top-right.png deleted file mode 100644 index b415e0b..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_top-right.png and /dev/null differ diff --git a/test/data/cairo_1.18.0/test_text_anchor_top.png b/test/data/cairo_1.18.0/test_text_anchor_top.png deleted file mode 100644 index 135937a..0000000 Binary files a/test/data/cairo_1.18.0/test_text_anchor_top.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_background_layer.png b/test/data/cairo_1.18.2/test_background_layer.png deleted file mode 100644 index 54abb6d..0000000 Binary files a/test/data/cairo_1.18.2/test_background_layer.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_circle_layer.png b/test/data/cairo_1.18.2/test_circle_layer.png deleted file mode 100644 index a6365ea..0000000 Binary files a/test/data/cairo_1.18.2/test_circle_layer.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_fill_layer.png b/test/data/cairo_1.18.2/test_fill_layer.png deleted file mode 100644 index 4cceb13..0000000 Binary files a/test/data/cairo_1.18.2/test_fill_layer.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_line_caps.png b/test/data/cairo_1.18.2/test_line_caps.png deleted file mode 100644 index 472f979..0000000 Binary files a/test/data/cairo_1.18.2/test_line_caps.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_line_joins.png b/test/data/cairo_1.18.2/test_line_joins.png deleted file mode 100644 index c9c362d..0000000 Binary files a/test/data/cairo_1.18.2/test_line_joins.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_line_layer.png b/test/data/cairo_1.18.2/test_line_layer.png deleted file mode 100644 index c42c775..0000000 Binary files a/test/data/cairo_1.18.2/test_line_layer.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_tiled_raster_layer.png b/test/data/cairo_1.18.2/test_tiled_raster_layer.png deleted file mode 100644 index 247f862..0000000 Binary files a/test/data/cairo_1.18.2/test_tiled_raster_layer.png and /dev/null differ diff --git a/test/data/cairo_1.18.2/test_attribution.png b/test/data/test_attribution.png similarity index 100% rename from test/data/cairo_1.18.2/test_attribution.png rename to test/data/test_attribution.png diff --git a/test/data/cairo_1.18.0/test_background_layer.png b/test/data/test_background_layer.png similarity index 100% rename from test/data/cairo_1.18.0/test_background_layer.png rename to test/data/test_background_layer.png diff --git a/test/data/cairo_1.18.0/test_circle_layer.png b/test/data/test_circle_layer.png similarity index 100% rename from test/data/cairo_1.18.0/test_circle_layer.png rename to test/data/test_circle_layer.png diff --git a/test/data/cairo_1.18.0/test_fill_layer.png b/test/data/test_fill_layer.png similarity index 100% rename from test/data/cairo_1.18.0/test_fill_layer.png rename to test/data/test_fill_layer.png diff --git a/test/data/cairo_1.18.0/test_line_caps.png b/test/data/test_line_caps.png similarity index 100% rename from test/data/cairo_1.18.0/test_line_caps.png rename to test/data/test_line_caps.png diff --git a/test/data/cairo_1.18.0/test_line_joins.png b/test/data/test_line_joins.png similarity index 100% rename from test/data/cairo_1.18.0/test_line_joins.png rename to test/data/test_line_joins.png diff --git a/test/data/cairo_1.18.0/test_line_layer.png b/test/data/test_line_layer.png similarity index 100% rename from test/data/cairo_1.18.0/test_line_layer.png rename to test/data/test_line_layer.png diff --git a/test/data/cairo_1.18.2/test_symbol_layer.png b/test/data/test_symbol_layer.png similarity index 100% rename from test/data/cairo_1.18.2/test_symbol_layer.png rename to test/data/test_symbol_layer.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_bottom-left.png b/test/data/test_text_anchor_bottom-left.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_bottom-left.png rename to test/data/test_text_anchor_bottom-left.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_bottom-right.png b/test/data/test_text_anchor_bottom-right.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_bottom-right.png rename to test/data/test_text_anchor_bottom-right.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_bottom.png b/test/data/test_text_anchor_bottom.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_bottom.png rename to test/data/test_text_anchor_bottom.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_center.png b/test/data/test_text_anchor_center.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_center.png rename to test/data/test_text_anchor_center.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_left.png b/test/data/test_text_anchor_left.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_left.png rename to test/data/test_text_anchor_left.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_right.png b/test/data/test_text_anchor_right.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_right.png rename to test/data/test_text_anchor_right.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_top-left.png b/test/data/test_text_anchor_top-left.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_top-left.png rename to test/data/test_text_anchor_top-left.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_top-right.png b/test/data/test_text_anchor_top-right.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_top-right.png rename to test/data/test_text_anchor_top-right.png diff --git a/test/data/cairo_1.18.2/test_text_anchor_top.png b/test/data/test_text_anchor_top.png similarity index 100% rename from test/data/cairo_1.18.2/test_text_anchor_top.png rename to test/data/test_text_anchor_top.png diff --git a/test/data/cairo_1.18.0/test_tiled_raster_layer.png b/test/data/test_tiled_raster_layer.png similarity index 100% rename from test/data/cairo_1.18.0/test_tiled_raster_layer.png rename to test/data/test_tiled_raster_layer.png diff --git a/test/test_symbol_layer.py b/test/test_symbol_layer.py index 5a4ca77..51af041 100644 --- a/test/test_symbol_layer.py +++ b/test/test_symbol_layer.py @@ -62,5 +62,3 @@ def test_text_alignment(tmp_path): map.add_layer(bg) map.add_layer(point) map.add_layer(layer) - - assert False diff --git a/test/util.py b/test/util.py index 3325994..fb289ca 100644 --- a/test/util.py +++ b/test/util.py @@ -15,8 +15,6 @@ def assert_render_equality( ): map = mapsy.Map() yield map - cairo_version = cairo.cairo_version_string() - print(f"cairo version: {cairo_version}") input_path = path.join("test", "data", "cairo_1.18.2", filename) output_path = input_path if create_input else path.join(tmp_path, filename) @@ -30,8 +28,4 @@ def assert_render_equality( assert path.exists(output_path) with open(output_path, "rb") as f: with open(input_path, "rb") as f_ref: - f_data = f.read() - f_ref_data = f_ref.read() - if f_data != f_ref_data: - print(f"image with issue: {base64.b64encode(f_data)}") - assert f_data == f_ref_data + assert f.read() == f_ref.read()