From da7e712cb407911bc4766710464ad7b2c7768d46 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 23 Jan 2016 13:46:36 +1100 Subject: [PATCH 1/2] Added MIC test --- Tests/test_file_mic.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_mic.py b/Tests/test_file_mic.py index 0a574422a..f0a2752a9 100644 --- a/Tests/test_file_mic.py +++ b/Tests/test_file_mic.py @@ -6,11 +6,16 @@ from PIL import MicImagePlugin class TestFileMic(PillowTestCase): def test_invalid_file(self): + # Test an invalid OLE file invalid_file = "Tests/images/flower.jpg" - self.assertRaises(SyntaxError, lambda: MicImagePlugin.MicImageFile(invalid_file)) + # Test a valid OLE file, but not a MIC file + ole_file = "Tests/images/test-ole-file.doc" + self.assertRaises(SyntaxError, + lambda: MicImagePlugin.MicImageFile(ole_file)) + if __name__ == '__main__': unittest.main() From a7a087e0b2c0ad80ab0270590a756d13a25300ec Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 23 Jan 2016 13:50:17 +1100 Subject: [PATCH 2/2] Added FPX test --- Tests/test_file_fpx.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_fpx.py b/Tests/test_file_fpx.py index 35119a612..01b285efe 100644 --- a/Tests/test_file_fpx.py +++ b/Tests/test_file_fpx.py @@ -6,11 +6,16 @@ from PIL import FpxImagePlugin class TestFileFpx(PillowTestCase): def test_invalid_file(self): + # Test an invalid OLE file invalid_file = "Tests/images/flower.jpg" - self.assertRaises(SyntaxError, lambda: FpxImagePlugin.FpxImageFile(invalid_file)) + # Test a valid OLE file, but not an FPX file + ole_file = "Tests/images/test-ole-file.doc" + self.assertRaises(SyntaxError, + lambda: FpxImagePlugin.FpxImageFile(ole_file)) + if __name__ == '__main__': unittest.main()