python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-10 08:30:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5345 from radarhere/tofile

Browse Source 
Increased use of assert_image_equal_tofile
This commit is contained in:
Hugo van Kemenade 2021-03-21 00:05:28 +02:00 committed by GitHub
commit 7235cf3135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Tests/test_imagedraw.py
View File

@ -856,20 +856,19 @@ def create_base_image_draw(
def test_square(): def test_square():
with Image.open(os.path.join(IMAGES_PATH, "square.png")) as expected: expected = os.path.join(IMAGES_PATH, "square.png")
expected.load() img, draw = create_base_image_draw((10, 10))
img, draw = create_base_image_draw((10, 10)) draw.polygon([(2, 2), (2, 7), (7, 7), (7, 2)], BLACK)
draw.polygon([(2, 2), (2, 7), (7, 7), (7, 2)], BLACK) assert_image_equal_tofile(img, expected, "square as normal polygon failed")
assert_image_equal(img, expected, "square as normal polygon failed") img, draw = create_base_image_draw((10, 10))
img, draw = create_base_image_draw((10, 10)) draw.polygon([(7, 7), (7, 2), (2, 2), (2, 7)], BLACK)
draw.polygon([(7, 7), (7, 2), (2, 2), (2, 7)], BLACK) assert_image_equal_tofile(img, expected, "square as inverted polygon failed")
assert_image_equal(img, expected, "square as inverted polygon failed") img, draw = create_base_image_draw((10, 10))
img, draw = create_base_image_draw((10, 10)) draw.rectangle((2, 2, 7, 7), BLACK)
draw.rectangle((2, 2, 7, 7), BLACK) assert_image_equal_tofile(img, expected, "square as normal rectangle failed")
assert_image_equal(img, expected, "square as normal rectangle failed") img, draw = create_base_image_draw((10, 10))
img, draw = create_base_image_draw((10, 10)) draw.rectangle((7, 7, 2, 2), BLACK)
draw.rectangle((7, 7, 2, 2), BLACK) assert_image_equal_tofile(img, expected, "square as inverted rectangle failed")
assert_image_equal(img, expected, "square as inverted rectangle failed")
def test_triangle_right(): def test_triangle_right():
@ -896,18 +895,18 @@ def test_line_horizontal():
os.path.join(IMAGES_PATH, "line_horizontal_w2px_inverted.png"), os.path.join(IMAGES_PATH, "line_horizontal_w2px_inverted.png"),
"line straight horizontal inverted 2px wide failed", "line straight horizontal inverted 2px wide failed",
) )
with Image.open(os.path.join(IMAGES_PATH, "line_horizontal_w3px.png")) as expected:
expected.load() expected = os.path.join(IMAGES_PATH, "line_horizontal_w3px.png")
img, draw = create_base_image_draw((20, 20)) img, draw = create_base_image_draw((20, 20))
draw.line((5, 5, 14, 5), BLACK, 3) draw.line((5, 5, 14, 5), BLACK, 3)
assert_image_equal( assert_image_equal_tofile(
img, expected, "line straight horizontal normal 3px wide failed" img, expected, "line straight horizontal normal 3px wide failed"
) )
img, draw = create_base_image_draw((20, 20)) img, draw = create_base_image_draw((20, 20))
draw.line((14, 5, 5, 5), BLACK, 3) draw.line((14, 5, 5, 5), BLACK, 3)
assert_image_equal( assert_image_equal_tofile(
img, expected, "line straight horizontal inverted 3px wide failed" img, expected, "line straight horizontal inverted 3px wide failed"
) )
img, draw = create_base_image_draw((200, 110)) img, draw = create_base_image_draw((200, 110))
draw.line((5, 55, 195, 55), BLACK, 101) draw.line((5, 55, 195, 55), BLACK, 101)
@ -945,18 +944,19 @@ def test_line_vertical():
os.path.join(IMAGES_PATH, "line_vertical_w2px_inverted.png"), os.path.join(IMAGES_PATH, "line_vertical_w2px_inverted.png"),
"line straight vertical inverted 2px wide failed", "line straight vertical inverted 2px wide failed",
) )
with Image.open(os.path.join(IMAGES_PATH, "line_vertical_w3px.png")) as expected:
expected.load() expected = os.path.join(IMAGES_PATH, "line_vertical_w3px.png")
img, draw = create_base_image_draw((20, 20)) img, draw = create_base_image_draw((20, 20))
draw.line((5, 5, 5, 14), BLACK, 3) draw.line((5, 5, 5, 14), BLACK, 3)
assert_image_equal( assert_image_equal_tofile(
img, expected, "line straight vertical normal 3px wide failed" img, expected, "line straight vertical normal 3px wide failed"
) )
img, draw = create_base_image_draw((20, 20)) img, draw = create_base_image_draw((20, 20))
draw.line((5, 14, 5, 5), BLACK, 3) draw.line((5, 14, 5, 5), BLACK, 3)
assert_image_equal( assert_image_equal_tofile(
img, expected, "line straight vertical inverted 3px wide failed" img, expected, "line straight vertical inverted 3px wide failed"
) )
img, draw = create_base_image_draw((110, 200)) img, draw = create_base_image_draw((110, 200))
draw.line((55, 5, 55, 195), BLACK, 101) draw.line((55, 5, 55, 195), BLACK, 101)
assert_image_equal_tofile( assert_image_equal_tofile(
@ -975,26 +975,25 @@ def test_line_vertical():
def test_line_oblique_45(): def test_line_oblique_45():
with Image.open( expected = os.path.join(IMAGES_PATH, "line_oblique_45_w3px_a.png")
os.path.join(IMAGES_PATH, "line_oblique_45_w3px_a.png") img, draw = create_base_image_draw((20, 20))
) as expected: draw.line((5, 5, 14, 14), BLACK, 3)
expected.load() assert_image_equal_tofile(img, expected, "line oblique 45 normal 3px wide A failed")
img, draw = create_base_image_draw((20, 20)) img, draw = create_base_image_draw((20, 20))
draw.line((5, 5, 14, 14), BLACK, 3) draw.line((14, 14, 5, 5), BLACK, 3)
assert_image_equal(img, expected, "line oblique 45 normal 3px wide A failed") assert_image_equal_tofile(
img, draw = create_base_image_draw((20, 20)) img, expected, "line oblique 45 inverted 3px wide A failed"
draw.line((14, 14, 5, 5), BLACK, 3) )
assert_image_equal(img, expected, "line oblique 45 inverted 3px wide A failed")
with Image.open( expected = os.path.join(IMAGES_PATH, "line_oblique_45_w3px_b.png")
os.path.join(IMAGES_PATH, "line_oblique_45_w3px_b.png") img, draw = create_base_image_draw((20, 20))
) as expected: draw.line((14, 5, 5, 14), BLACK, 3)
expected.load() assert_image_equal_tofile(img, expected, "line oblique 45 normal 3px wide B failed")
img, draw = create_base_image_draw((20, 20)) img, draw = create_base_image_draw((20, 20))
draw.line((14, 5, 5, 14), BLACK, 3) draw.line((5, 14, 14, 5), BLACK, 3)
assert_image_equal(img, expected, "line oblique 45 normal 3px wide B failed") assert_image_equal_tofile(
img, draw = create_base_image_draw((20, 20)) img, expected, "line oblique 45 inverted 3px wide B failed"
draw.line((5, 14, 14, 5), BLACK, 3) )
assert_image_equal(img, expected, "line oblique 45 inverted 3px wide B failed")
def test_wide_line_dot(): def test_wide_line_dot():