From 90fdd46109ac252f9a22488b279caee1d2104685 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 14 Dec 2014 23:14:11 +0100 Subject: [PATCH] local: Cleanup translator tests --- tests/local/test_translator.py | 41 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/tests/local/test_translator.py b/tests/local/test_translator.py index a473a0ff..d3ba9e68 100644 --- a/tests/local/test_translator.py +++ b/tests/local/test_translator.py @@ -6,9 +6,9 @@ import os import tempfile import unittest -from mopidy.local.translator import parse_m3u +from mopidy.local import translator from mopidy.models import Track -from mopidy.utils.path import path_to_uri +from mopidy.utils import path from tests import path_to_data_dir @@ -16,9 +16,9 @@ data_dir = path_to_data_dir('') song1_path = path_to_data_dir('song1.mp3') song2_path = path_to_data_dir('song2.mp3') encoded_path = path_to_data_dir('æøå.mp3') -song1_uri = path_to_uri(song1_path) -song2_uri = path_to_uri(song2_path) -encoded_uri = path_to_uri(encoded_path) +song1_uri = path.path_to_uri(song1_path) +song2_uri = path.path_to_uri(song2_path) +encoded_uri = path.path_to_uri(encoded_path) song1_track = Track(uri=song1_uri) song2_track = Track(uri=song2_uri) encoded_track = Track(uri=encoded_uri) @@ -30,23 +30,26 @@ encoded_ext_track = encoded_track.copy(name='æøå') # FIXME use mock instead of tempfile.NamedTemporaryFile class M3UToUriTest(unittest.TestCase): + def parse(self, name): + return translator.parse_m3u(name, data_dir) + def test_empty_file(self): - tracks = parse_m3u(path_to_data_dir('empty.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('empty.m3u')) self.assertEqual([], tracks) def test_basic_file(self): - tracks = parse_m3u(path_to_data_dir('one.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('one.m3u')) self.assertEqual([song1_track], tracks) def test_file_with_comment(self): - tracks = parse_m3u(path_to_data_dir('comment.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('comment.m3u')) self.assertEqual([song1_track], tracks) def test_file_is_relative_to_correct_dir(self): with tempfile.NamedTemporaryFile(delete=False) as tmp: tmp.write('song1.mp3') try: - tracks = parse_m3u(tmp.name, data_dir) + tracks = self.parse(tmp.name) self.assertEqual([song1_track], tracks) finally: if os.path.exists(tmp.name): @@ -56,7 +59,7 @@ class M3UToUriTest(unittest.TestCase): with tempfile.NamedTemporaryFile(delete=False) as tmp: tmp.write(song1_path) try: - tracks = parse_m3u(tmp.name, data_dir) + tracks = self.parse(tmp.name) self.assertEqual([song1_track], tracks) finally: if os.path.exists(tmp.name): @@ -68,7 +71,7 @@ class M3UToUriTest(unittest.TestCase): tmp.write('# comment \n') tmp.write(song2_path) try: - tracks = parse_m3u(tmp.name, data_dir) + tracks = self.parse(tmp.name) self.assertEqual([song1_track, song2_track], tracks) finally: if os.path.exists(tmp.name): @@ -78,38 +81,38 @@ class M3UToUriTest(unittest.TestCase): with tempfile.NamedTemporaryFile(delete=False) as tmp: tmp.write(song1_uri) try: - tracks = parse_m3u(tmp.name, data_dir) + tracks = self.parse(tmp.name) self.assertEqual([song1_track], tracks) finally: if os.path.exists(tmp.name): os.remove(tmp.name) def test_encoding_is_latin1(self): - tracks = parse_m3u(path_to_data_dir('encoding.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('encoding.m3u')) self.assertEqual([encoded_track], tracks) def test_open_missing_file(self): - tracks = parse_m3u(path_to_data_dir('non-existant.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('non-existant.m3u')) self.assertEqual([], tracks) def test_empty_ext_file(self): - tracks = parse_m3u(path_to_data_dir('empty-ext.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('empty-ext.m3u')) self.assertEqual([], tracks) def test_basic_ext_file(self): - tracks = parse_m3u(path_to_data_dir('one-ext.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('one-ext.m3u')) self.assertEqual([song1_ext_track], tracks) def test_multi_ext_file(self): - tracks = parse_m3u(path_to_data_dir('two-ext.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('two-ext.m3u')) self.assertEqual([song1_ext_track, song2_ext_track], tracks) def test_ext_file_with_comment(self): - tracks = parse_m3u(path_to_data_dir('comment-ext.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('comment-ext.m3u')) self.assertEqual([song1_ext_track], tracks) def test_ext_encoding_is_latin1(self): - tracks = parse_m3u(path_to_data_dir('encoding-ext.m3u'), data_dir) + tracks = self.parse(path_to_data_dir('encoding-ext.m3u')) self.assertEqual([encoded_ext_track], tracks)