mirror of
https://github.com/beetbox/beets.git
synced 2026-01-03 06:22:48 +01:00
Move many tests from test_library to test_util
Sice they only test functions from beets/util/__init__.py there's not reason for them to reside in test/test_library.py.
This commit is contained in:
Bruno Cauet
parent
5d9128aff3
commit
489b6b2e7e
2 changed files with 135 additions and 114 deletions
|
|
@ -240,27 +240,6 @@ class DestinationTest(_common.TestCase):
|
|||
self.assertFalse('two \\ three' in p)
|
||||
self.assertFalse('two / three' in p)
|
||||
|
||||
def test_sanitize_unix_replaces_leading_dot(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'one/.two/three')
|
||||
self.assertFalse('.' in p)
|
||||
|
||||
def test_sanitize_windows_replaces_trailing_dot(self):
|
||||
with _common.platform_windows():
|
||||
p = util.sanitize_path(u'one/two./three')
|
||||
self.assertFalse('.' in p)
|
||||
|
||||
def test_sanitize_windows_replaces_illegal_chars(self):
|
||||
with _common.platform_windows():
|
||||
p = util.sanitize_path(u':*?"<>|')
|
||||
self.assertFalse(':' in p)
|
||||
self.assertFalse('*' in p)
|
||||
self.assertFalse('?' in p)
|
||||
self.assertFalse('"' in p)
|
||||
self.assertFalse('<' in p)
|
||||
self.assertFalse('>' in p)
|
||||
self.assertFalse('|' in p)
|
||||
|
||||
def test_path_with_format(self):
|
||||
self.lib.path_formats = [('default', '$artist/$album ($format)')]
|
||||
p = self.i.destination()
|
||||
|
|
@ -337,11 +316,6 @@ class DestinationTest(_common.TestCase):
|
|||
]
|
||||
self.assertEqual(self.i.destination(), np('one/three'))
|
||||
|
||||
def test_sanitize_windows_replaces_trailing_space(self):
|
||||
with _common.platform_windows():
|
||||
p = util.sanitize_path(u'one/two /three')
|
||||
self.assertFalse(' ' in p)
|
||||
|
||||
def test_get_formatted_does_not_replace_separators(self):
|
||||
with _common.platform_posix():
|
||||
name = os.path.join('a', 'b')
|
||||
|
|
@ -407,25 +381,6 @@ class DestinationTest(_common.TestCase):
|
|||
p = self.i.destination()
|
||||
self.assertEqual(p.rsplit(os.path.sep, 1)[1], 'something')
|
||||
|
||||
def test_sanitize_path_works_on_empty_string(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'')
|
||||
self.assertEqual(p, u'')
|
||||
|
||||
def test_sanitize_with_custom_replace_overrides_built_in_sub(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'a/.?/b', [
|
||||
(re.compile(r'foo'), u'bar'),
|
||||
])
|
||||
self.assertEqual(p, u'a/.?/b')
|
||||
|
||||
def test_sanitize_with_custom_replace_adds_replacements(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'foo/bar', [
|
||||
(re.compile(r'foo'), u'bar'),
|
||||
])
|
||||
self.assertEqual(p, u'bar/bar')
|
||||
|
||||
def test_unicode_normalized_nfd_on_mac(self):
|
||||
instr = unicodedata.normalize('NFC', u'caf\xe9')
|
||||
self.lib.path_formats = [('default', instr)]
|
||||
|
|
@ -474,14 +429,6 @@ class DestinationTest(_common.TestCase):
|
|||
self.assertEqual(self.i.destination(),
|
||||
np('base/ber/foo'))
|
||||
|
||||
@unittest.skip('unimplemented: #359')
|
||||
def test_sanitize_empty_component(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'foo//bar', [
|
||||
(re.compile(r'^$'), u'_'),
|
||||
])
|
||||
self.assertEqual(p, u'foo/_/bar')
|
||||
|
||||
@unittest.skip('unimplemented: #359')
|
||||
def test_destination_with_empty_component(self):
|
||||
self.lib.directory = 'base'
|
||||
|
|
@ -700,49 +647,6 @@ class DisambiguationTest(_common.TestCase, PathFormattingMixin):
|
|||
self._assert_dest('/base/foo [foo_bar]/the title', self.i1)
|
||||
|
||||
|
||||
class PathConversionTest(_common.TestCase):
|
||||
def test_syspath_windows_format(self):
|
||||
with _common.platform_windows():
|
||||
path = os.path.join('a', 'b', 'c')
|
||||
outpath = util.syspath(path)
|
||||
self.assertTrue(isinstance(outpath, unicode))
|
||||
self.assertTrue(outpath.startswith(u'\\\\?\\'))
|
||||
|
||||
def test_syspath_windows_format_unc_path(self):
|
||||
# The \\?\ prefix on Windows behaves differently with UNC
|
||||
# (network share) paths.
|
||||
path = '\\\\server\\share\\file.mp3'
|
||||
with _common.platform_windows():
|
||||
outpath = util.syspath(path)
|
||||
self.assertTrue(isinstance(outpath, unicode))
|
||||
self.assertEqual(outpath, u'\\\\?\\UNC\\server\\share\\file.mp3')
|
||||
|
||||
def test_syspath_posix_unchanged(self):
|
||||
with _common.platform_posix():
|
||||
path = os.path.join('a', 'b', 'c')
|
||||
outpath = util.syspath(path)
|
||||
self.assertEqual(path, outpath)
|
||||
|
||||
def _windows_bytestring_path(self, path):
|
||||
old_gfse = sys.getfilesystemencoding
|
||||
sys.getfilesystemencoding = lambda: 'mbcs'
|
||||
try:
|
||||
with _common.platform_windows():
|
||||
return util.bytestring_path(path)
|
||||
finally:
|
||||
sys.getfilesystemencoding = old_gfse
|
||||
|
||||
def test_bytestring_path_windows_encodes_utf8(self):
|
||||
path = u'caf\xe9'
|
||||
outpath = self._windows_bytestring_path(path)
|
||||
self.assertEqual(path, outpath.decode('utf8'))
|
||||
|
||||
def test_bytesting_path_windows_removes_magic_prefix(self):
|
||||
path = u'\\\\?\\C:\\caf\xe9'
|
||||
outpath = self._windows_bytestring_path(path)
|
||||
self.assertEqual(outpath, u'C:\\caf\xe9'.encode('utf8'))
|
||||
|
||||
|
||||
class PluginDestinationTest(_common.TestCase):
|
||||
def setUp(self):
|
||||
super(PluginDestinationTest, self).setUp()
|
||||
|
|
@ -1004,23 +908,6 @@ class PathStringTest(_common.TestCase):
|
|||
self.assert_(isinstance(alb.artpath, bytes))
|
||||
|
||||
|
||||
class PathTruncationTest(_common.TestCase):
|
||||
def test_truncate_bytestring(self):
|
||||
with _common.platform_posix():
|
||||
p = util.truncate_path(b'abcde/fgh', 4)
|
||||
self.assertEqual(p, b'abcd/fgh')
|
||||
|
||||
def test_truncate_unicode(self):
|
||||
with _common.platform_posix():
|
||||
p = util.truncate_path(u'abcde/fgh', 4)
|
||||
self.assertEqual(p, u'abcd/fgh')
|
||||
|
||||
def test_truncate_preserves_extension(self):
|
||||
with _common.platform_posix():
|
||||
p = util.truncate_path(u'abcde/fgh.ext', 5)
|
||||
self.assertEqual(p, u'abcde/f.ext')
|
||||
|
||||
|
||||
class MtimeTest(_common.TestCase):
|
||||
def setUp(self):
|
||||
super(MtimeTest, self).setUp()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,27 @@
|
|||
# This file is part of beets.
|
||||
# Copyright 2015, Adrian Sampson.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining
|
||||
# a copy of this software and associated documentation files (the
|
||||
# "Software"), to deal in the Software without restriction, including
|
||||
# without limitation the rights to use, copy, modify, merge, publish,
|
||||
# distribute, sublicense, and/or sell copies of the Software, and to
|
||||
# permit persons to whom the Software is furnished to do so, subject to
|
||||
# the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be
|
||||
# included in all copies or substantial portions of the Software.
|
||||
"""Tests for base utils from the beets.util package.
|
||||
"""
|
||||
from __future__ import (division, absolute_import, print_function,
|
||||
unicode_literals)
|
||||
|
||||
import sys
|
||||
import re
|
||||
import os
|
||||
|
||||
from test._common import unittest
|
||||
from test import _common
|
||||
|
||||
from beets import util
|
||||
|
||||
|
||||
|
|
@ -15,6 +36,119 @@ class UtilTest(unittest.TestCase):
|
|||
with _common.system_mock('Tagada'):
|
||||
self.assertEqual(util.open_anything(), 'xdg-open')
|
||||
|
||||
def test_sanitize_unix_replaces_leading_dot(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'one/.two/three')
|
||||
self.assertFalse('.' in p)
|
||||
|
||||
def test_sanitize_windows_replaces_trailing_dot(self):
|
||||
with _common.platform_windows():
|
||||
p = util.sanitize_path(u'one/two./three')
|
||||
self.assertFalse('.' in p)
|
||||
|
||||
def test_sanitize_windows_replaces_illegal_chars(self):
|
||||
with _common.platform_windows():
|
||||
p = util.sanitize_path(u':*?"<>|')
|
||||
self.assertFalse(':' in p)
|
||||
self.assertFalse('*' in p)
|
||||
self.assertFalse('?' in p)
|
||||
self.assertFalse('"' in p)
|
||||
self.assertFalse('<' in p)
|
||||
self.assertFalse('>' in p)
|
||||
self.assertFalse('|' in p)
|
||||
|
||||
def test_sanitize_windows_replaces_trailing_space(self):
|
||||
with _common.platform_windows():
|
||||
p = util.sanitize_path(u'one/two /three')
|
||||
self.assertFalse(' ' in p)
|
||||
|
||||
def test_sanitize_path_works_on_empty_string(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'')
|
||||
self.assertEqual(p, u'')
|
||||
|
||||
def test_sanitize_with_custom_replace_overrides_built_in_sub(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'a/.?/b', [
|
||||
(re.compile(r'foo'), u'bar'),
|
||||
])
|
||||
self.assertEqual(p, u'a/.?/b')
|
||||
|
||||
def test_sanitize_with_custom_replace_adds_replacements(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'foo/bar', [
|
||||
(re.compile(r'foo'), u'bar'),
|
||||
])
|
||||
self.assertEqual(p, u'bar/bar')
|
||||
|
||||
@unittest.skip('unimplemented: #359')
|
||||
def test_sanitize_empty_component(self):
|
||||
with _common.platform_posix():
|
||||
p = util.sanitize_path(u'foo//bar', [
|
||||
(re.compile(r'^$'), u'_'),
|
||||
])
|
||||
self.assertEqual(p, u'foo/_/bar')
|
||||
|
||||
|
||||
class PathConversionTest(_common.TestCase):
|
||||
def test_syspath_windows_format(self):
|
||||
with _common.platform_windows():
|
||||
path = os.path.join('a', 'b', 'c')
|
||||
outpath = util.syspath(path)
|
||||
self.assertTrue(isinstance(outpath, unicode))
|
||||
self.assertTrue(outpath.startswith(u'\\\\?\\'))
|
||||
|
||||
def test_syspath_windows_format_unc_path(self):
|
||||
# The \\?\ prefix on Windows behaves differently with UNC
|
||||
# (network share) paths.
|
||||
path = '\\\\server\\share\\file.mp3'
|
||||
with _common.platform_windows():
|
||||
outpath = util.syspath(path)
|
||||
self.assertTrue(isinstance(outpath, unicode))
|
||||
self.assertEqual(outpath, u'\\\\?\\UNC\\server\\share\\file.mp3')
|
||||
|
||||
def test_syspath_posix_unchanged(self):
|
||||
with _common.platform_posix():
|
||||
path = os.path.join('a', 'b', 'c')
|
||||
outpath = util.syspath(path)
|
||||
self.assertEqual(path, outpath)
|
||||
|
||||
def _windows_bytestring_path(self, path):
|
||||
old_gfse = sys.getfilesystemencoding
|
||||
sys.getfilesystemencoding = lambda: 'mbcs'
|
||||
try:
|
||||
with _common.platform_windows():
|
||||
return util.bytestring_path(path)
|
||||
finally:
|
||||
sys.getfilesystemencoding = old_gfse
|
||||
|
||||
def test_bytestring_path_windows_encodes_utf8(self):
|
||||
path = u'caf\xe9'
|
||||
outpath = self._windows_bytestring_path(path)
|
||||
self.assertEqual(path, outpath.decode('utf8'))
|
||||
|
||||
def test_bytesting_path_windows_removes_magic_prefix(self):
|
||||
path = u'\\\\?\\C:\\caf\xe9'
|
||||
outpath = self._windows_bytestring_path(path)
|
||||
self.assertEqual(outpath, u'C:\\caf\xe9'.encode('utf8'))
|
||||
|
||||
|
||||
class PathTruncationTest(_common.TestCase):
|
||||
def test_truncate_bytestring(self):
|
||||
with _common.platform_posix():
|
||||
p = util.truncate_path(b'abcde/fgh', 4)
|
||||
self.assertEqual(p, b'abcd/fgh')
|
||||
|
||||
def test_truncate_unicode(self):
|
||||
with _common.platform_posix():
|
||||
p = util.truncate_path(u'abcde/fgh', 4)
|
||||
self.assertEqual(p, u'abcd/fgh')
|
||||
|
||||
def test_truncate_preserves_extension(self):
|
||||
with _common.platform_posix():
|
||||
p = util.truncate_path(u'abcde/fgh.ext', 5)
|
||||
self.assertEqual(p, u'abcde/f.ext')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.TestLoader().loadTestsFromName(__name__)
|
||||
|
|
|
|||
Loading…
Reference in a new issue