From 387a2dbc3c3dd524e06f995665b201e7d2bf28b3 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Wed, 16 May 2012 17:13:01 -0700
Subject: [PATCH] fix tests for GC-362

---
 test/test_ui.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/test/test_ui.py b/test/test_ui.py
index d74e37b9c..fd244ea18 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -46,8 +46,16 @@ class ListTest(unittest.TestCase):
     def tearDown(self):
         self.io.restore()
 
+    def _run_list(self, query='', album=False, path=False, fmt=None):
+        if not fmt:
+            if album:
+                fmt = commands.DEFAULT_LIST_FORMAT_ALBUM
+            else:
+                fmt = commands.DEFAULT_LIST_FORMAT_ITEM
+        commands.list_items(self.lib, query, album, path, fmt)
+
     def test_list_outputs_item(self):
-        commands.list_items(self.lib, '', False, False, None)
+        self._run_list()
         out = self.io.getoutput()
         self.assertTrue(u'the title' in out)
 
@@ -56,49 +64,49 @@ class ListTest(unittest.TestCase):
         self.lib.store(self.item)
         self.lib.conn.commit()
 
-        commands.list_items(self.lib, [u'na\xefve'], False, False, None)
+        self._run_list([u'na\xefve'])
         out = self.io.getoutput()
         self.assertTrue(u'na\xefve' in out.decode(self.io.stdout.encoding))
 
     def test_list_item_path(self):
-        commands.list_items(self.lib, '', False, True, None)
+        self._run_list(path=True)
         out = self.io.getoutput()
         self.assertEqual(out.strip(), u'xxx/yyy')
 
     def test_list_album_outputs_something(self):
-        commands.list_items(self.lib, '', True, False, None)
+        self._run_list(album=True)
         out = self.io.getoutput()
         self.assertGreater(len(out), 0)
 
     def test_list_album_path(self):
-        commands.list_items(self.lib, '', True, True, None)
+        self._run_list(album=True, path=True)
         out = self.io.getoutput()
         self.assertEqual(out.strip(), u'xxx')
 
     def test_list_album_omits_title(self):
-        commands.list_items(self.lib, '', True, False, None)
+        self._run_list(album=True)
         out = self.io.getoutput()
         self.assertTrue(u'the title' not in out)
 
     def test_list_uses_track_artist(self):
-        commands.list_items(self.lib, '', False, False, None)
+        self._run_list()
         out = self.io.getoutput()
         self.assertTrue(u'the artist' in out)
         self.assertTrue(u'the album artist' not in out)
 
     def test_list_album_uses_album_artist(self):
-        commands.list_items(self.lib, '', True, False, None)
+        self._run_list(album=True)
         out = self.io.getoutput()
         self.assertTrue(u'the artist' not in out)
         self.assertTrue(u'the album artist' in out)
 
     def test_list_item_format_artist(self):
-        commands.list_items(self.lib, '', False, False, '$artist')
+        self._run_list(fmt='$artist')
         out = self.io.getoutput()
         self.assertTrue(u'the artist' in out)
 
     def test_list_item_format_multiple(self):
-        commands.list_items(self.lib, '', False, False, '$artist - $album - $year')
+        self._run_list(fmt='$artist - $album - $year')
         out = self.io.getoutput()
         self.assertTrue(u'1' in out)
         self.assertTrue(u'the album' in out)
@@ -106,13 +114,13 @@ class ListTest(unittest.TestCase):
         self.assertEqual(u'the artist - the album - 1', out.strip())
 
     def test_list_album_format(self):
-        commands.list_items(self.lib, '', True, False, '$genre')
+        self._run_list(album=True, fmt='$genre')
         out = self.io.getoutput()
         self.assertTrue(u'the genre' in out)
         self.assertTrue(u'the album' not in out)
 
     def test_list_item_path_ignores_format(self):
-        commands.list_items(self.lib, '', False, True, '$year - $artist')
+        self._run_list(path=True, fmt='$year - $artist')
         out = self.io.getoutput()
         self.assertEqual(out.strip(), u'xxx/yyy')