Removed unicode_literals from test_types_plugin

This commit is contained in:
Peter Kessen 2016-02-25 07:27:08 +01:00
parent f33d922898
commit e1890f836e

View file

@ -13,8 +13,7 @@
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
from __future__ import (division, absolute_import, print_function,
unicode_literals)
from __future__ import (division, absolute_import, print_function)
import time
from datetime import datetime
@ -37,69 +36,69 @@ class TypesPluginTest(unittest.TestCase, TestHelper):
def test_integer_modify_and_query(self):
self.config['types'] = {'myint': 'int'}
item = self.add_item(artist='aaa')
item = self.add_item(artist=u'aaa')
# Do not match unset values
out = self.list('myint:1..3')
self.assertEqual('', out)
out = self.list(u'myint:1..3')
self.assertEqual(u'', out)
self.modify('myint=2')
self.modify(u'myint=2')
item.load()
self.assertEqual(item['myint'], 2)
# Match in range
out = self.list('myint:1..3')
out = self.list(u'myint:1..3')
self.assertIn(b'aaa', out)
def test_album_integer_modify_and_query(self):
self.config['types'] = {'myint': 'int'}
album = self.add_album(albumartist='aaa')
self.config['types'] = {'myint': u'int'}
album = self.add_album(albumartist=u'aaa')
# Do not match unset values
out = self.list_album('myint:1..3')
self.assertEqual('', out)
out = self.list_album(u'myint:1..3')
self.assertEqual(u'', out)
self.modify('-a', 'myint=2')
self.modify(u'-a', u'myint=2')
album.load()
self.assertEqual(album['myint'], 2)
# Match in range
out = self.list_album('myint:1..3')
out = self.list_album(u'myint:1..3')
self.assertIn(b'aaa', out)
def test_float_modify_and_query(self):
self.config['types'] = {'myfloat': 'float'}
item = self.add_item(artist='aaa')
self.config['types'] = {'myfloat': u'float'}
item = self.add_item(artist=u'aaa')
self.modify('myfloat=-9.1')
self.modify(u'myfloat=-9.1')
item.load()
self.assertEqual(item['myfloat'], -9.1)
# Match in range
out = self.list('myfloat:-10..0')
out = self.list(u'myfloat:-10..0')
self.assertIn(b'aaa', out)
def test_bool_modify_and_query(self):
self.config['types'] = {'mybool': 'bool'}
true = self.add_item(artist='true')
false = self.add_item(artist='false')
self.add_item(artist='unset')
self.config['types'] = {'mybool': u'bool'}
true = self.add_item(artist=u'true')
false = self.add_item(artist=u'false')
self.add_item(artist=u'unset')
# Set true
self.modify('mybool=1', 'artist:true')
self.modify(u'mybool=1', u'artist:true')
true.load()
self.assertEqual(true['mybool'], True)
# Set false
self.modify('mybool=false', 'artist:false')
self.modify(u'mybool=false', u'artist:false')
false.load()
self.assertEqual(false['mybool'], False)
# Query bools
out = self.list('mybool:true', '$artist $mybool')
self.assertEqual('true True', out)
out = self.list(u'mybool:true', u'$artist $mybool')
self.assertEqual(u'true True', out)
out = self.list('mybool:false', '$artist $mybool')
out = self.list(u'mybool:false', u'$artist $mybool')
# Dealing with unset fields?
# self.assertEqual('false False', out)
@ -107,23 +106,23 @@ class TypesPluginTest(unittest.TestCase, TestHelper):
# self.assertIn('unset $mybool', out)
def test_date_modify_and_query(self):
self.config['types'] = {'mydate': 'date'}
self.config['types'] = {'mydate': u'date'}
# FIXME parsing should also work with default time format
self.config['time_format'] = '%Y-%m-%d'
old = self.add_item(artist='prince')
new = self.add_item(artist='britney')
old = self.add_item(artist=u'prince')
new = self.add_item(artist=u'britney')
self.modify('mydate=1999-01-01', 'artist:prince')
self.modify(u'mydate=1999-01-01', u'artist:prince')
old.load()
self.assertEqual(old['mydate'], mktime(1999, 01, 01))
self.modify('mydate=1999-12-30', 'artist:britney')
self.modify(u'mydate=1999-12-30', u'artist:britney')
new.load()
self.assertEqual(new['mydate'], mktime(1999, 12, 30))
# Match in range
out = self.list('mydate:..1999-07', '$artist $mydate')
self.assertEqual('prince 1999-01-01', out)
out = self.list(u'mydate:..1999-07', u'$artist $mydate')
self.assertEqual(u'prince 1999-01-01', out)
# FIXME some sort of timezone issue here
# out = self.list('mydate:1999-12-30', '$artist $mydate')
@ -132,17 +131,17 @@ class TypesPluginTest(unittest.TestCase, TestHelper):
def test_unknown_type_error(self):
self.config['types'] = {'flex': 'unkown type'}
with self.assertRaises(ConfigValueError):
self.run_command('ls')
self.run_command(u'ls')
def modify(self, *args):
return self.run_with_output('modify', '--yes', '--nowrite',
'--nomove', *args)
return self.run_with_output(u'modify', u'--yes', u'--nowrite',
u'--nomove', *args)
def list(self, query, fmt='$artist - $album - $title'):
return self.run_with_output('ls', '-f', fmt, query).strip()
def list(self, query, fmt=u'$artist - $album - $title'):
return self.run_with_output(u'ls', u'-f', fmt, query).strip()
def list_album(self, query, fmt='$albumartist - $album - $title'):
return self.run_with_output('ls', '-a', '-f', fmt, query).strip()
def list_album(self, query, fmt=u'$albumartist - $album - $title'):
return self.run_with_output(u'ls', u'-a', u'-f', fmt, query).strip()
def mktime(*args):