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

updating tests for legacy_api api change

Browse Source
This commit is contained in:
wiredfool 2015-09-13 14:08:49 +01:00
parent e1236d702d
commit 2636679868
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/test_file_libtiff.py
View File

@ -127,11 +127,14 @@ class TestFileLibTiff(LibTiffTestCase):
""" Test metadata writing through libtiff """ """ Test metadata writing through libtiff """
for legacy_api in [False, True]: for legacy_api in [False, True]:
img = Image.open('Tests/images/hopper_g4.tif') img = Image.open('Tests/images/hopper_g4.tif')
img.tag.legacy_api = legacy_api
f = self.tempfile('temp.tiff') f = self.tempfile('temp.tiff')
img.save(f, tiffinfo=img.tag) img.save(f, tiffinfo=img.tag)
if legacy_api:
original = img.tag.named() original = img.tag.named()
else:
original = img.tag_v2.named()
# PhotometricInterpretation is set from SAVE_INFO, # PhotometricInterpretation is set from SAVE_INFO,
# not the original image. # not the original image.
@ -139,8 +142,10 @@ class TestFileLibTiff(LibTiffTestCase):
'PhotometricInterpretation'] 'PhotometricInterpretation']
loaded = Image.open(f) loaded = Image.open(f)
loaded.tag.legacy_api = legacy_api if legacy_api:
reloaded = loaded.tag.named() reloaded = loaded.tag.named()
else:
reloaded = loaded.tag_v2.named()
for tag, value in itertools.chain(reloaded.items(), for tag, value in itertools.chain(reloaded.items(),
original.items()): original.items()):

9
Tests/test_file_tiff.py
View File

@ -254,27 +254,26 @@ class TestFileTiff(PillowTestCase):
def test_load_byte(self): def test_load_byte(self):
for legacy_api in [False, True]: for legacy_api in [False, True]:
ifd = TiffImagePlugin.ImageFileDirectory_v2() ifd = TiffImagePlugin.ImageFileDirectory_v2()
ifd.legacy_api = legacy_api
data = b"abc" data = b"abc"
ret = ifd.load_byte(data) ret = ifd.load_byte(legacy_api, data)
self.assertEqual(ret, b"abc" if legacy_api else (97, 98, 99)) self.assertEqual(ret, b"abc" if legacy_api else (97, 98, 99))
def test_load_string(self): def test_load_string(self):
ifd = TiffImagePlugin.ImageFileDirectory_v2() ifd = TiffImagePlugin.ImageFileDirectory_v2()
data = b"abc\0" data = b"abc\0"
ret = ifd.load_string(data) ret = ifd.load_string(False, data)
self.assertEqual(ret, "abc") self.assertEqual(ret, "abc")
def test_load_float(self): def test_load_float(self):
ifd = TiffImagePlugin.ImageFileDirectory_v2() ifd = TiffImagePlugin.ImageFileDirectory_v2()
data = b"abcdabcd" data = b"abcdabcd"
ret = ifd.load_float(data) ret = ifd.load_float(False, data)
self.assertEqual(ret, (1.6777999408082104e+22, 1.6777999408082104e+22)) self.assertEqual(ret, (1.6777999408082104e+22, 1.6777999408082104e+22))
def test_load_double(self): def test_load_double(self):
ifd = TiffImagePlugin.ImageFileDirectory_v2() ifd = TiffImagePlugin.ImageFileDirectory_v2()
data = b"abcdefghabcdefgh" data = b"abcdefghabcdefgh"
ret = ifd.load_double(data) ret = ifd.load_double(False, data)
self.assertEqual(ret, (8.540883223036124e+194, 8.540883223036124e+194)) self.assertEqual(ret, (8.540883223036124e+194, 8.540883223036124e+194))
def test_seek(self): def test_seek(self):

6
Tests/test_file_tiff_metadata.py
View File

@ -17,7 +17,7 @@ class TestFileTiffMetadata(PillowTestCase):
img = hopper() img = hopper()
# Behaviour change: # Behaviour change: re #1416
# Pre ifd rewrite, ImageJMetaData was being written as a string(2), # Pre ifd rewrite, ImageJMetaData was being written as a string(2),
# Post ifd rewrite, it's defined as arbitrary bytes(7). It should # Post ifd rewrite, it's defined as arbitrary bytes(7). It should
# roundtrip with the actual bytes, rather than stripped text # roundtrip with the actual bytes, rather than stripped text
@ -116,8 +116,8 @@ class TestFileTiffMetadata(PillowTestCase):
loaded = Image.open(f) loaded = Image.open(f)
original = img.tag.named() original = img.tag_v2.named()
reloaded = loaded.tag.named() reloaded = loaded.tag_v2.named()
ignored = [ ignored = [
'StripByteCounts', 'RowsPerStrip', 'PageNumber', 'StripOffsets'] 'StripByteCounts', 'RowsPerStrip', 'PageNumber', 'StripOffsets']