From b246e4b709f54cca4190f830ae99c4908cf80082 Mon Sep 17 00:00:00 2001
From: Laurent Monin <zas@norz.org>
Date: Sat, 8 Jun 2013 00:54:09 +0200
Subject: [PATCH] Reduce cover art vs formats test code redundancy.

---
 test/test_formats.py | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/test/test_formats.py b/test/test_formats.py
index bfe0c2e75..865de1c0d 100644
--- a/test/test_formats.py
+++ b/test/test_formats.py
@@ -532,27 +532,24 @@ class TestCoverArt(unittest.TestCase):
     def _test_cover_art(self, filename):
         self._set_up(filename)
         try:
-            f = picard.formats.open(self.filename)
-            metadata = Metadata()
             # Use reasonable large data > 64kb.
             # This checks a mutagen error with ASF files.
-            jpegFakeData = "JFIF" + ("a" * 1024 * 128)
-            metadata.add_image("image/jpeg", jpegFakeData)
-            f._save(self.filename, metadata, f.config.setting)
+            dummyload = "a" * 1024 * 128
+            tests = {
+                'jpg': {'mime': 'image/jpeg', 'head': 'JFIF'},
+                'png': {'mime': 'image/png',  'head': 'PNG'},
+            }
+            for t in tests:
+                f = picard.formats.open(self.filename)
+                metadata = Metadata()
+                imgdata = tests[t]['head'] + dummyload
+                metadata.add_image(tests[t]['mime'], imgdata)
+                f._save(self.filename, metadata, f.config.setting)
 
-            f = picard.formats.open(self.filename)
-            metadata = f._load(self.filename)
-            self.assertEqual(metadata.images[0]["mime"], "image/jpeg")
-            self.assertEqual(metadata.images[0]["data"], jpegFakeData)
-
-            f = picard.formats.open(self.filename)
-            metadata = Metadata()
-            metadata.add_image("image/png", "PNGfoobar")
-            f._save(self.filename, metadata, f.config.setting)
-
-            f = picard.formats.open(self.filename)
-            metadata = f._load(self.filename)
-            self.assertEqual(metadata.images[0]["mime"], "image/png")
-            self.assertEqual(metadata.images[0]["data"], "PNGfoobar")
+                f = picard.formats.open(self.filename)
+                loaded_metadata = f._load(self.filename)
+                image = loaded_metadata.images[0]
+                self.assertEqual(image["mime"], tests[t]['mime'])
+                self.assertEqual(image["data"], imgdata)
         finally:
             self._tear_down()