summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorjvoisin2018-07-06 00:49:17 +0200
committerjvoisin2018-07-06 00:49:17 +0200
commit3d80f9752481b8967616698bb3c0c014e6f1527a (patch)
tree65dca424d2826daf0214c4e3a731c7a741ee1bc7 /tests
parent53271495f74bde7fde2329b7c5c938654a36b7dc (diff)
Simplify BMP handling
Diffstat (limited to 'tests')
-rw-r--r--tests/test_corrupted_files.py5
-rw-r--r--tests/test_libmat2.py4
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/test_corrupted_files.py b/tests/test_corrupted_files.py
index 4b2243d..1beb2ba 100644
--- a/tests/test_corrupted_files.py
+++ b/tests/test_corrupted_files.py
@@ -4,7 +4,7 @@ import unittest
4import shutil 4import shutil
5import os 5import os
6 6
7from libmat2 import pdf, images, audio, office, parser_factory, torrent 7from libmat2 import pdf, images, audio, office, parser_factory, torrent, harmless
8 8
9 9
10class TestUnsupportedFiles(unittest.TestCase): 10class TestUnsupportedFiles(unittest.TestCase):
@@ -65,8 +65,7 @@ class TestCorruptedFiles(unittest.TestCase):
65 65
66 def test_bmp(self): 66 def test_bmp(self):
67 shutil.copy('./tests/data/dirty.png', './tests/data/clean.bmp') 67 shutil.copy('./tests/data/dirty.png', './tests/data/clean.bmp')
68 with self.assertRaises(ValueError): 68 harmless.HarmlessParser('./tests/data/clean.bmp')
69 images.BMPParser('./tests/data/clean.bmp')
70 os.remove('./tests/data/clean.bmp') 69 os.remove('./tests/data/clean.bmp')
71 70
72 def test_docx(self): 71 def test_docx(self):
diff --git a/tests/test_libmat2.py b/tests/test_libmat2.py
index 90f37a8..512efe8 100644
--- a/tests/test_libmat2.py
+++ b/tests/test_libmat2.py
@@ -417,7 +417,7 @@ class TestCleaning(unittest.TestCase):
417 417
418 def test_bmp(self): 418 def test_bmp(self):
419 shutil.copy('./tests/data/dirty.bmp', './tests/data/clean.bmp') 419 shutil.copy('./tests/data/dirty.bmp', './tests/data/clean.bmp')
420 p = images.BMPParser('./tests/data/clean.bmp') 420 p = harmless.HarmlessParser('./tests/data/clean.bmp')
421 421
422 meta = p.get_meta() 422 meta = p.get_meta()
423 self.assertEqual(meta, {}) # bmp has no meta :) 423 self.assertEqual(meta, {}) # bmp has no meta :)
@@ -425,7 +425,7 @@ class TestCleaning(unittest.TestCase):
425 ret = p.remove_all() 425 ret = p.remove_all()
426 self.assertTrue(ret) 426 self.assertTrue(ret)
427 427
428 p = images.BMPParser('./tests/data/clean.cleaned.bmp') 428 p = harmless.HarmlessParser('./tests/data/clean.cleaned.bmp')
429 self.assertEqual(p.get_meta(), {}) 429 self.assertEqual(p.get_meta(), {})
430 430
431 os.remove('./tests/data/clean.bmp') 431 os.remove('./tests/data/clean.bmp')