From 26366798686049656f68509ac6fbc93d49cd4324 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Sun, 13 Sep 2015 14:08:49 +0100 Subject: [PATCH] updating tests for legacy_api api change --- Tests/test_file_libtiff.py | 13 +++++++++---- Tests/test_file_tiff.py | 9 ++++----- Tests/test_file_tiff_metadata.py | 6 +++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 33d77f558..5d4016555 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -127,11 +127,14 @@ class TestFileLibTiff(LibTiffTestCase): """ Test metadata writing through libtiff """ for legacy_api in [False, True]: img = Image.open('Tests/images/hopper_g4.tif') - img.tag.legacy_api = legacy_api f = self.tempfile('temp.tiff') img.save(f, tiffinfo=img.tag) - original = img.tag.named() + + if legacy_api: + original = img.tag.named() + else: + original = img.tag_v2.named() # PhotometricInterpretation is set from SAVE_INFO, # not the original image. @@ -139,8 +142,10 @@ class TestFileLibTiff(LibTiffTestCase): 'PhotometricInterpretation'] loaded = Image.open(f) - loaded.tag.legacy_api = legacy_api - reloaded = loaded.tag.named() + if legacy_api: + reloaded = loaded.tag.named() + else: + reloaded = loaded.tag_v2.named() for tag, value in itertools.chain(reloaded.items(), original.items()): diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 7ec6d9e60..2d787e66d 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -254,27 +254,26 @@ class TestFileTiff(PillowTestCase): def test_load_byte(self): for legacy_api in [False, True]: ifd = TiffImagePlugin.ImageFileDirectory_v2() - ifd.legacy_api = legacy_api 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)) def test_load_string(self): ifd = TiffImagePlugin.ImageFileDirectory_v2() data = b"abc\0" - ret = ifd.load_string(data) + ret = ifd.load_string(False, data) self.assertEqual(ret, "abc") def test_load_float(self): ifd = TiffImagePlugin.ImageFileDirectory_v2() data = b"abcdabcd" - ret = ifd.load_float(data) + ret = ifd.load_float(False, data) self.assertEqual(ret, (1.6777999408082104e+22, 1.6777999408082104e+22)) def test_load_double(self): ifd = TiffImagePlugin.ImageFileDirectory_v2() data = b"abcdefghabcdefgh" - ret = ifd.load_double(data) + ret = ifd.load_double(False, data) self.assertEqual(ret, (8.540883223036124e+194, 8.540883223036124e+194)) def test_seek(self): diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index ed968ef00..05aa98bb5 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -17,7 +17,7 @@ class TestFileTiffMetadata(PillowTestCase): img = hopper() - # Behaviour change: + # Behaviour change: re #1416 # Pre ifd rewrite, ImageJMetaData was being written as a string(2), # Post ifd rewrite, it's defined as arbitrary bytes(7). It should # roundtrip with the actual bytes, rather than stripped text @@ -116,8 +116,8 @@ class TestFileTiffMetadata(PillowTestCase): loaded = Image.open(f) - original = img.tag.named() - reloaded = loaded.tag.named() + original = img.tag_v2.named() + reloaded = loaded.tag_v2.named() ignored = [ 'StripByteCounts', 'RowsPerStrip', 'PageNumber', 'StripOffsets']