mirror of
https://github.com/beetbox/beets.git
synced 2025-12-09 10:05:35 +01:00
Removed unicode_literals from test_mediafile
This commit is contained in:
Peter Kessen
parent
2ac27e72a6
commit
00a8ffe49b
1 changed files with 41 additions and 42 deletions
|
|
@ -16,8 +16,7 @@
|
|||
"""Automatically-generated blanket testing for the MediaFile metadata
|
||||
layer.
|
||||
"""
|
||||
from __future__ import (division, absolute_import, print_function,
|
||||
unicode_literals)
|
||||
from __future__ import (division, absolute_import, print_function)
|
||||
|
||||
import os
|
||||
import shutil
|
||||
|
|
@ -109,18 +108,18 @@ class ImageStructureTestMixin(ArtTestMixin):
|
|||
image = next(i for i in mediafile.images
|
||||
if i.mime_type == 'image/png')
|
||||
self.assertEqual(image.data, self.png_data)
|
||||
self.assertExtendedImageAttributes(image, desc='album cover',
|
||||
self.assertExtendedImageAttributes(image, desc=u'album cover',
|
||||
type=ImageType.front)
|
||||
|
||||
image = next(i for i in mediafile.images
|
||||
if i.mime_type == 'image/jpeg')
|
||||
self.assertEqual(image.data, self.jpg_data)
|
||||
self.assertExtendedImageAttributes(image, desc='the artist',
|
||||
self.assertExtendedImageAttributes(image, desc=u'the artist',
|
||||
type=ImageType.artist)
|
||||
|
||||
def test_set_image_structure(self):
|
||||
mediafile = self._mediafile_fixture('empty')
|
||||
image = Image(data=self.png_data, desc='album cover',
|
||||
image = Image(data=self.png_data, desc=u'album cover',
|
||||
type=ImageType.front)
|
||||
mediafile.images = [image]
|
||||
mediafile.save()
|
||||
|
|
@ -131,14 +130,14 @@ class ImageStructureTestMixin(ArtTestMixin):
|
|||
image = mediafile.images[0]
|
||||
self.assertEqual(image.data, self.png_data)
|
||||
self.assertEqual(image.mime_type, 'image/png')
|
||||
self.assertExtendedImageAttributes(image, desc='album cover',
|
||||
self.assertExtendedImageAttributes(image, desc=u'album cover',
|
||||
type=ImageType.front)
|
||||
|
||||
def test_add_image_structure(self):
|
||||
mediafile = self._mediafile_fixture('image')
|
||||
self.assertEqual(len(mediafile.images), 2)
|
||||
|
||||
image = Image(data=self.png_data, desc='the composer',
|
||||
image = Image(data=self.png_data, desc=u'the composer',
|
||||
type=ImageType.composer)
|
||||
mediafile.images += [image]
|
||||
mediafile.save()
|
||||
|
|
@ -146,10 +145,10 @@ class ImageStructureTestMixin(ArtTestMixin):
|
|||
mediafile = MediaFile(mediafile.path)
|
||||
self.assertEqual(len(mediafile.images), 3)
|
||||
|
||||
images = (i for i in mediafile.images if i.desc == 'the composer')
|
||||
images = (i for i in mediafile.images if i.desc == u'the composer')
|
||||
image = next(images, None)
|
||||
self.assertExtendedImageAttributes(
|
||||
image, desc='the composer', type=ImageType.composer
|
||||
image, desc=u'the composer', type=ImageType.composer
|
||||
)
|
||||
|
||||
def test_delete_image_structures(self):
|
||||
|
|
@ -166,7 +165,7 @@ class ImageStructureTestMixin(ArtTestMixin):
|
|||
mediafile = self._mediafile_fixture('image')
|
||||
self.assertEqual(len(mediafile.images), 2)
|
||||
cover = CoverArtField.guess_cover_image(mediafile.images)
|
||||
self.assertEqual(cover.desc, 'album cover')
|
||||
self.assertEqual(cover.desc, u'album cover')
|
||||
self.assertEqual(mediafile.art, cover.data)
|
||||
|
||||
def assertExtendedImageAttributes(self, image, **kwargs):
|
||||
|
|
@ -186,7 +185,7 @@ class ExtendedImageStructureTestMixin(ImageStructureTestMixin):
|
|||
mediafile = self._mediafile_fixture('image')
|
||||
self.assertEqual(len(mediafile.images), 2)
|
||||
|
||||
image = Image(data=self.tiff_data, desc='the composer',
|
||||
image = Image(data=self.tiff_data, desc=u'the composer',
|
||||
type=ImageType.composer)
|
||||
mediafile.images += [image]
|
||||
mediafile.save()
|
||||
|
|
@ -198,14 +197,14 @@ class ExtendedImageStructureTestMixin(ImageStructureTestMixin):
|
|||
image = filter(lambda i: i.mime_type == 'image/tiff',
|
||||
mediafile.images)[0]
|
||||
self.assertExtendedImageAttributes(
|
||||
image, desc='the composer', type=ImageType.composer)
|
||||
image, desc=u'the composer', type=ImageType.composer)
|
||||
|
||||
|
||||
class LazySaveTestMixin(object):
|
||||
"""Mediafile should only write changes when tags have changed
|
||||
"""
|
||||
|
||||
@unittest.skip('not yet implemented')
|
||||
@unittest.skip(u'not yet implemented')
|
||||
def test_unmodified(self):
|
||||
mediafile = self._mediafile_fixture('full')
|
||||
mtime = self._set_past_mtime(mediafile.path)
|
||||
|
|
@ -214,7 +213,7 @@ class LazySaveTestMixin(object):
|
|||
mediafile.save()
|
||||
self.assertEqual(os.stat(mediafile.path).st_mtime, mtime)
|
||||
|
||||
@unittest.skip('not yet implemented')
|
||||
@unittest.skip(u'not yet implemented')
|
||||
def test_same_tag_value(self):
|
||||
mediafile = self._mediafile_fixture('full')
|
||||
mtime = self._set_past_mtime(mediafile.path)
|
||||
|
|
@ -233,14 +232,14 @@ class LazySaveTestMixin(object):
|
|||
mediafile.save()
|
||||
self.assertEqual(os.stat(mediafile.path).st_mtime, mtime)
|
||||
|
||||
@unittest.skip('not yet implemented')
|
||||
@unittest.skip(u'not yet implemented')
|
||||
def test_tag_value_change(self):
|
||||
mediafile = self._mediafile_fixture('full')
|
||||
mtime = self._set_past_mtime(mediafile.path)
|
||||
self.assertEqual(os.stat(mediafile.path).st_mtime, mtime)
|
||||
|
||||
mediafile.title = mediafile.title
|
||||
mediafile.album = 'another'
|
||||
mediafile.album = u'another'
|
||||
mediafile.save()
|
||||
self.assertNotEqual(os.stat(mediafile.path).st_mtime, mtime)
|
||||
|
||||
|
|
@ -249,7 +248,7 @@ class LazySaveTestMixin(object):
|
|||
mtime = self._set_past_mtime(mediafile.path)
|
||||
self.assertEqual(os.stat(mediafile.path).st_mtime, mtime)
|
||||
|
||||
mediafile.update({'title': mediafile.title, 'album': 'another'})
|
||||
mediafile.update({'title': mediafile.title, 'album': u'another'})
|
||||
mediafile.save()
|
||||
self.assertNotEqual(os.stat(mediafile.path).st_mtime, mtime)
|
||||
|
||||
|
|
@ -273,7 +272,7 @@ class GenreListTestMixin(object):
|
|||
mediafile.save()
|
||||
|
||||
mediafile = MediaFile(mediafile.path)
|
||||
self.assertItemsEqual(mediafile.genres, ['one', 'two'])
|
||||
self.assertItemsEqual(mediafile.genres, [u'one', u'two'])
|
||||
|
||||
def test_write_genre_list_get_first(self):
|
||||
mediafile = self._mediafile_fixture('empty')
|
||||
|
|
@ -281,11 +280,11 @@ class GenreListTestMixin(object):
|
|||
mediafile.save()
|
||||
|
||||
mediafile = MediaFile(mediafile.path)
|
||||
self.assertEqual(mediafile.genre, 'one')
|
||||
self.assertEqual(mediafile.genre, u'one')
|
||||
|
||||
def test_append_genre_list(self):
|
||||
mediafile = self._mediafile_fixture('full')
|
||||
self.assertEqual(mediafile.genre, 'the genre')
|
||||
self.assertEqual(mediafile.genre, u'the genre')
|
||||
mediafile.genres += [u'another']
|
||||
mediafile.save()
|
||||
|
||||
|
|
@ -308,11 +307,11 @@ class ExtendedFieldTestMixin(object):
|
|||
plugin.add_media_field('customtag', field_extension)
|
||||
|
||||
mediafile = self._mediafile_fixture('empty')
|
||||
mediafile.customtag = 'F#'
|
||||
mediafile.customtag = u'F#'
|
||||
mediafile.save()
|
||||
|
||||
mediafile = MediaFile(mediafile.path)
|
||||
self.assertEqual(mediafile.customtag, 'F#')
|
||||
self.assertEqual(mediafile.customtag, u'F#')
|
||||
delattr(MediaFile, 'customtag')
|
||||
Item._media_fields.remove('customtag')
|
||||
|
||||
|
|
@ -323,10 +322,10 @@ class ExtendedFieldTestMixin(object):
|
|||
mediafile = self._mediafile_fixture('empty')
|
||||
self.assertIsNone(mediafile.customtag)
|
||||
|
||||
item = Item(path=mediafile.path, customtag='Gb')
|
||||
item = Item(path=mediafile.path, customtag=u'Gb')
|
||||
item.write()
|
||||
mediafile = MediaFile(mediafile.path)
|
||||
self.assertEqual(mediafile.customtag, 'Gb')
|
||||
self.assertEqual(mediafile.customtag, u'Gb')
|
||||
|
||||
delattr(MediaFile, 'customtag')
|
||||
Item._media_fields.remove('customtag')
|
||||
|
|
@ -336,11 +335,11 @@ class ExtendedFieldTestMixin(object):
|
|||
plugin.add_media_field('customtag', field_extension)
|
||||
|
||||
mediafile = self._mediafile_fixture('empty')
|
||||
mediafile.update({'customtag': 'F#'})
|
||||
mediafile.update({'customtag': u'F#'})
|
||||
mediafile.save()
|
||||
|
||||
item = Item.from_path(mediafile.path)
|
||||
self.assertEqual(item['customtag'], 'F#')
|
||||
self.assertEqual(item['customtag'], u'F#')
|
||||
|
||||
delattr(MediaFile, 'customtag')
|
||||
Item._media_fields.remove('customtag')
|
||||
|
|
@ -348,13 +347,13 @@ class ExtendedFieldTestMixin(object):
|
|||
def test_invalid_descriptor(self):
|
||||
with self.assertRaises(ValueError) as cm:
|
||||
MediaFile.add_field('somekey', True)
|
||||
self.assertIn('must be an instance of MediaField',
|
||||
self.assertIn(u'must be an instance of MediaField',
|
||||
unicode(cm.exception))
|
||||
|
||||
def test_overwrite_property(self):
|
||||
with self.assertRaises(ValueError) as cm:
|
||||
MediaFile.add_field('artist', MediaField())
|
||||
self.assertIn('property "artist" already exists',
|
||||
self.assertIn(u'property "artist" already exists',
|
||||
unicode(cm.exception))
|
||||
|
||||
|
||||
|
|
@ -667,12 +666,12 @@ class ReadWriteTestBase(ArtTestMixin, GenreListTestMixin,
|
|||
try:
|
||||
value2 = getattr(mediafile, key)
|
||||
except AttributeError:
|
||||
errors.append('Tag %s does not exist' % key)
|
||||
errors.append(u'Tag %s does not exist' % key)
|
||||
else:
|
||||
if value2 != value:
|
||||
errors.append('Tag %s: %r != %r' % (key, value2, value))
|
||||
errors.append(u'Tag %s: %r != %r' % (key, value2, value))
|
||||
if any(errors):
|
||||
errors = ['Tags did not match'] + errors
|
||||
errors = [u'Tags did not match'] + errors
|
||||
self.fail('\n '.join(errors))
|
||||
|
||||
def _mediafile_fixture(self, name):
|
||||
|
|
@ -788,7 +787,7 @@ class MusepackTest(ReadWriteTestBase, unittest.TestCase):
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 23458,
|
||||
'format': 'Musepack',
|
||||
'format': u'Musepack',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 0,
|
||||
'channels': 2,
|
||||
|
|
@ -801,7 +800,7 @@ class WMATest(ReadWriteTestBase, ExtendedImageStructureTestMixin,
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 128000,
|
||||
'format': 'Windows Media',
|
||||
'format': u'Windows Media',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 0,
|
||||
'channels': 1,
|
||||
|
|
@ -818,9 +817,9 @@ class WMATest(ReadWriteTestBase, ExtendedImageStructureTestMixin,
|
|||
|
||||
def test_read_pure_tags(self):
|
||||
mediafile = self._mediafile_fixture('pure')
|
||||
self.assertEqual(mediafile.comments, 'the comments')
|
||||
self.assertEqual(mediafile.title, 'the title')
|
||||
self.assertEqual(mediafile.artist, 'the artist')
|
||||
self.assertEqual(mediafile.comments, u'the comments')
|
||||
self.assertEqual(mediafile.title, u'the title')
|
||||
self.assertEqual(mediafile.artist, u'the artist')
|
||||
|
||||
|
||||
class OggTest(ReadWriteTestBase, ExtendedImageStructureTestMixin,
|
||||
|
|
@ -829,7 +828,7 @@ class OggTest(ReadWriteTestBase, ExtendedImageStructureTestMixin,
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 48000,
|
||||
'format': 'OGG',
|
||||
'format': u'OGG',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 0,
|
||||
'channels': 1,
|
||||
|
|
@ -873,7 +872,7 @@ class FlacTest(ReadWriteTestBase, PartialTestMixin,
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 175120,
|
||||
'format': 'FLAC',
|
||||
'format': u'FLAC',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 16,
|
||||
'channels': 1,
|
||||
|
|
@ -886,7 +885,7 @@ class ApeTest(ReadWriteTestBase, ExtendedImageStructureTestMixin,
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 112040,
|
||||
'format': 'APE',
|
||||
'format': u'APE',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 16,
|
||||
'channels': 1,
|
||||
|
|
@ -898,7 +897,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase):
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 108744,
|
||||
'format': 'WavPack',
|
||||
'format': u'WavPack',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 0,
|
||||
'channels': 1,
|
||||
|
|
@ -910,7 +909,7 @@ class OpusTest(ReadWriteTestBase, unittest.TestCase):
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 57984,
|
||||
'format': 'Opus',
|
||||
'format': u'Opus',
|
||||
'samplerate': 48000,
|
||||
'bitdepth': 0,
|
||||
'channels': 1,
|
||||
|
|
@ -922,7 +921,7 @@ class AIFFTest(ReadWriteTestBase, unittest.TestCase):
|
|||
audio_properties = {
|
||||
'length': 1.0,
|
||||
'bitrate': 705600,
|
||||
'format': 'AIFF',
|
||||
'format': u'AIFF',
|
||||
'samplerate': 44100,
|
||||
'bitdepth': 0,
|
||||
'channels': 1,
|
||||
|
|
|
|||
Loading…
Reference in a new issue