From 40f12e5eb29434b3a04715ebf238c500fca0ff60 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 24 Jun 2019 14:59:22 +0200
Subject: [PATCH] Simplified metadata comparisson in tests

---
 test/test_metadata.py | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/test/test_metadata.py b/test/test_metadata.py
index 672b63bc7..1c911e226 100644
--- a/test/test_metadata.py
+++ b/test/test_metadata.py
@@ -108,33 +108,19 @@ class MetadataTest(PicardTestCase):
         m["old"] = "old-value"
         self.metadata.delete("single1")
         m.copy(self.metadata)
-
+        self.assertEqual(self.metadata._store, m._store)
         self.assertEqual(self.metadata.deleted_tags, m.deleted_tags)
         self.assertEqual(self.metadata.length, m.length)
         self.assertEqual(self.metadata.images, m.images)
 
-        for (key, value) in self.metadata.rawitems():
-            self.assertIn(key, m)
-            self.assertEqual(value, m.getraw(key))
-        for (key, value) in m.rawitems():
-            self.assertIn(key, self.metadata)
-            self.assertEqual(value, self.metadata.getraw(key))
-
     def test_metadata_copy_without_images(self):
         m = Metadata()
         m.copy(self.metadata, copy_images=False)
-
+        self.assertEqual(self.metadata._store, m._store)
         self.assertEqual(self.metadata.deleted_tags, m.deleted_tags)
         self.assertEqual(self.metadata.length, m.length)
         self.assertEqual(ImageList(), m.images)
 
-        for (key, value) in self.metadata.rawitems():
-            self.assertIn(key, m)
-            self.assertEqual(value, m.getraw(key))
-        for (key, value) in m.rawitems():
-            self.assertIn(key, self.metadata)
-            self.assertEqual(value, self.metadata.getraw(key))
-
     def test_metadata_update(self):
         m = Metadata()
         m["old"] = "old-value"
@@ -148,12 +134,7 @@ class MetadataTest(PicardTestCase):
         self.assertEqual(self.metadata.images, m.images)
 
         self.metadata["old"] = "old-value"
-        for (key, value) in self.metadata.rawitems():
-            self.assertIn(key, m)
-            self.assertEqual(value, m.getraw(key))
-        for (key, value) in m.rawitems():
-            self.assertIn(key, self.metadata)
-            self.assertEqual(value, self.metadata.getraw(key))
+        self.assertEqual(self.metadata._store, m._store)
 
     def test_metadata_clear(self):
         self.metadata.clear()