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

Replaced assert_image_equal with assert_image_equal_tofile

Browse Source
This commit is contained in:
Andrew Murray 2021-03-23 21:40:18 +11:00
parent 2922a00e9c
commit 97982cf703
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Tests/test_file_ppm.py
View File

@ -5,12 +5,7 @@ import pytest
from PIL import Image, PpmImagePlugin from PIL import Image, PpmImagePlugin
from .helper import ( from .helper import assert_image_equal_tofile, assert_image_similar, hopper
assert_image_equal,
assert_image_equal_tofile,
assert_image_similar,
hopper,
)
# sample ppm stream # sample ppm stream
TEST_FILE = "Tests/images/hopper.ppm" TEST_FILE = "Tests/images/hopper.ppm"
@ -56,46 +51,36 @@ def test_pnm(tmp_path):
def test_plain_pbm(tmp_path): def test_plain_pbm(tmp_path):
with Image.open("Tests/images/hopper_1bit_plain.pbm") as im1, Image.open( with Image.open("Tests/images/hopper_1bit_plain.pbm") as im:
"Tests/images/hopper_1bit.pbm" assert_image_equal_tofile(im, "Tests/images/hopper_1bit.pbm")
) as im2:
assert_image_equal(im1, im2)
def test_8bit_plain_pgm(tmp_path): def test_8bit_plain_pgm(tmp_path):
with Image.open("Tests/images/hopper_8bit_plain.pgm") as im1, Image.open( with Image.open("Tests/images/hopper_8bit_plain.pgm") as im:
"Tests/images/hopper_8bit.pgm" assert_image_equal_tofile(im, "Tests/images/hopper_8bit.pgm")
) as im2:
assert_image_equal(im1, im2)
def test_8bit_plain_ppm(tmp_path): def test_8bit_plain_ppm(tmp_path):
with Image.open("Tests/images/hopper_8bit_plain.ppm") as im1, Image.open( with Image.open("Tests/images/hopper_8bit_plain.ppm") as im:
"Tests/images/hopper_8bit.ppm" assert_image_equal_tofile(im, "Tests/images/hopper_8bit.ppm")
) as im2:
assert_image_equal(im1, im2)
def test_16bit_plain_pgm(tmp_path): def test_16bit_plain_pgm(tmp_path):
with Image.open("Tests/images/hopper_16bit_plain.pgm") as im1, Image.open( with Image.open("Tests/images/hopper_16bit_plain.pgm") as im:
"Tests/images/hopper_16bit.pgm" assert im.mode == "I"
) as im2: assert im.size == (128, 128)
assert im1.mode == "I" assert im.get_format_mimetype() == "image/x-portable-graymap"
assert im1.size == (128, 128)
assert im1.get_format_mimetype() == "image/x-portable-graymap"
assert_image_equal(im1, im2) assert_image_equal_tofile(im, "Tests/images/hopper_16bit.pgm")
def test_32bit_plain_pgm(tmp_path): def test_32bit_plain_pgm(tmp_path):
with Image.open("Tests/images/hopper_32bit_plain.pgm") as im1, Image.open( with Image.open("Tests/images/hopper_32bit_plain.pgm") as im:
"Tests/images/hopper_32bit.pgm" assert im.mode == "I"
) as im2: assert im.size == (128, 128)
assert im1.mode == "I" assert im.get_format_mimetype() == "image/x-portable-graymap"
assert im1.size == (128, 128)
assert im1.get_format_mimetype() == "image/x-portable-graymap"
assert_image_equal(im1, im2) assert_image_equal_tofile(im, "Tests/images/hopper_32bit.pgm")
def test_plain_pbm_data_with_comments(tmp_path): def test_plain_pbm_data_with_comments(tmp_path):
@ -106,8 +91,8 @@ def test_plain_pbm_data_with_comments(tmp_path):
f1.write(b"P1\n2 2\n\n1010") f1.write(b"P1\n2 2\n\n1010")
f2.write(b"P1\n2 2\n" + comment + b"\n1010" + comment) f2.write(b"P1\n2 2\n" + comment + b"\n1010" + comment)
with Image.open(path1) as im1, Image.open(path2) as im2: with Image.open(path1) as im:
assert_image_equal(im1, im2) assert_image_equal_tofile(im, path2)
def test_plain_pbm_truncated_data(tmp_path): def test_plain_pbm_truncated_data(tmp_path):
@ -140,8 +125,8 @@ def test_plain_ppm_data_with_comments(tmp_path):
b"P3\n2 2\n255\n" + comment + b"\n0 0 0 001 1 1 2 2 2 255 255 255" + comment b"P3\n2 2\n255\n" + comment + b"\n0 0 0 001 1 1 2 2 2 255 255 255" + comment
) )
with Image.open(path1) as im1, Image.open(path2) as im2: with Image.open(path1) as im:
assert_image_equal(im1, im2) assert_image_equal_tofile(im, path2)
def test_plain_ppm_truncated_data(tmp_path): def test_plain_ppm_truncated_data(tmp_path):