diff --git a/test/formats/common.py b/test/formats/common.py index be41c6745..7a2a4d90f 100644 --- a/test/formats/common.py +++ b/test/formats/common.py @@ -227,7 +227,7 @@ class CommonTests: loaded_metadata = save_and_load_metadata(self.filename, metadata) for tag in tags: self.assertFalse(self.format.supports_tag(tag)) - self.assertTrue(tag not in loaded_metadata, '%s: %r != None' % (tag, loaded_metadata[tag])) + self.assertNotIn(tag, loaded_metadata, '%s: %r != None' % (tag, loaded_metadata[tag])) class TagFormatsTestCase(SimpleFormatsTestCase): diff --git a/test/formats/test_id3.py b/test/formats/test_id3.py index 323f0ebe7..7c1fd070f 100644 --- a/test/formats/test_id3.py +++ b/test/formats/test_id3.py @@ -176,21 +176,21 @@ class CommonId3Tests: file_path = os.path.join('test', 'data', 'test-id3-rename-tags.mp3') filename = self.copy_file_tmp(file_path, 'mp3') raw_metadata = load_raw(filename) - self.assertTrue('TXXX:Artists' in raw_metadata) - self.assertFalse('TXXX:ARTISTS' in raw_metadata) - self.assertTrue('TXXX:Work' in raw_metadata) - self.assertFalse('TXXX:WORK' in raw_metadata) + self.assertIn('TXXX:Artists', raw_metadata) + self.assertNotIn('TXXX:ARTISTS', raw_metadata) + self.assertIn('TXXX:Work', raw_metadata) + self.assertNotIn('TXXX:WORK', raw_metadata) metadata = load_metadata(filename) self.assertEqual(metadata['artists'], 'Artist1; Artist2') - self.assertFalse('Artists' in metadata) + self.assertNotIn('Artists', metadata) self.assertEqual(metadata['work'], 'The Work') - self.assertFalse('Work' in metadata) + self.assertNotIn('Work', metadata) save_metadata(filename, metadata) raw_metadata = load_raw(filename) - self.assertFalse('TXXX:Artists' in raw_metadata) - self.assertTrue('TXXX:ARTISTS' in raw_metadata) - self.assertFalse('TXXX:Work' in raw_metadata) - self.assertTrue('TXXX:WORK' in raw_metadata) + self.assertNotIn('TXXX:Artists', raw_metadata) + self.assertIn('TXXX:ARTISTS', raw_metadata) + self.assertNotIn('TXXX:Work', raw_metadata) + self.assertIn('TXXX:WORK', raw_metadata) def test_preserve_unchanged_tags_v23(self): config.setting['write_id3v23'] = True diff --git a/test/test_imagelist.py b/test/test_imagelist.py index effd28b42..151960796 100644 --- a/test/test_imagelist.py +++ b/test/test_imagelist.py @@ -262,8 +262,8 @@ class ImageListTest(PicardTestCase): list3.append(self.images['a']) list3.append(self.images['c']) - self.assertTrue(list1 == list2) - self.assertFalse(list1 == list3) + self.assertEqual(list1, list2) + self.assertNotEqual(list1, list3) def test_get_front_image(self): self.imagelist.append(self.images['a']) diff --git a/test/test_mbjson.py b/test/test_mbjson.py index bdcfb9b6c..3ecedeed3 100644 --- a/test/test_mbjson.py +++ b/test/test_mbjson.py @@ -157,7 +157,7 @@ class RecordingCreditsTest(MBJSONTest): t = Track("1") recording_to_metadata(self.json_doc, m, t) config.setting["standardize_artists"] = False - self.assertTrue('performer:solo' not in m) + self.assertNotIn('performer:solo', m) self.assertEqual(m['performer:solo vocals'], 'Frida') def test_recording_standardize_artist_credits(self): @@ -165,7 +165,7 @@ class RecordingCreditsTest(MBJSONTest): t = Track("1") config.setting["standardize_artists"] = True recording_to_metadata(self.json_doc, m, t) - self.assertTrue('performer:solo' not in m) + self.assertNotIn('performer:solo', m) self.assertEqual(m['performer:solo vocals'], 'Anni-Frid Lyngstad') diff --git a/test/test_metadata.py b/test/test_metadata.py index bb8f8f7ad..315d2485f 100644 --- a/test/test_metadata.py +++ b/test/test_metadata.py @@ -237,7 +237,7 @@ class MetadataTest(PicardTestCase): d = {'a': 'b', 'c': 2, 'd': ['x', 'y'], 'x': '', 'z': {'u', 'w'}} deleted_tags = set('c') m = Metadata(d, deleted_tags=deleted_tags, length=1234) - self.assertTrue('a' in m) + self.assertIn('a', m) self.assertEqual(m.getraw('a'), ['b']) self.assertEqual(m['d'], MULTI_VALUED_JOINER.join(d['d'])) self.assertNotIn('c', m)