From 3d80f9752481b8967616698bb3c0c014e6f1527a Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 6 Jul 2018 00:49:17 +0200
Subject: Simplify BMP handling

---
 tests/test_corrupted_files.py | 5 ++---
 tests/test_libmat2.py         | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'tests')

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
 import shutil
 import os
 
-from libmat2 import pdf, images, audio, office, parser_factory, torrent
+from libmat2 import pdf, images, audio, office, parser_factory, torrent, harmless
 
 
 class TestUnsupportedFiles(unittest.TestCase):
@@ -65,8 +65,7 @@ class TestCorruptedFiles(unittest.TestCase):
 
     def test_bmp(self):
         shutil.copy('./tests/data/dirty.png', './tests/data/clean.bmp')
-        with self.assertRaises(ValueError):
-             images.BMPParser('./tests/data/clean.bmp')
+        harmless.HarmlessParser('./tests/data/clean.bmp')
         os.remove('./tests/data/clean.bmp')
 
     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):
 
     def test_bmp(self):
         shutil.copy('./tests/data/dirty.bmp', './tests/data/clean.bmp')
-        p = images.BMPParser('./tests/data/clean.bmp')
+        p = harmless.HarmlessParser('./tests/data/clean.bmp')
 
         meta = p.get_meta()
         self.assertEqual(meta, {})  # bmp has no meta :)
@@ -425,7 +425,7 @@ class TestCleaning(unittest.TestCase):
         ret = p.remove_all()
         self.assertTrue(ret)
 
-        p = images.BMPParser('./tests/data/clean.cleaned.bmp')
+        p = harmless.HarmlessParser('./tests/data/clean.cleaned.bmp')
         self.assertEqual(p.get_meta(), {})
 
         os.remove('./tests/data/clean.bmp')
-- 
cgit v1.3