From 552b3ac723fcf95606ef205fb4d4310db4f89543 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 13 Feb 2010 19:58:19 +0100
Subject: [PATCH] Fix tests and coverage for track status output

---
 tests/modelstest.py      | 26 ++++++++++++++++++++++++--
 tests/mpd/handlertest.py |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/modelstest.py b/tests/modelstest.py
index aaa2ee1e..29911dc7 100644
--- a/tests/modelstest.py
+++ b/tests/modelstest.py
@@ -106,11 +106,33 @@ class TrackTest(unittest.TestCase):
         self.assert_(('Artist', '') in result)
         self.assert_(('Title', '') in result)
         self.assert_(('Album', '') in result)
-        self.assert_(('Track', '0/0') in result)
+        self.assert_(('Track', 0) in result)
         self.assert_(('Date', '') in result)
         self.assert_(('Pos', 0) in result)
         self.assert_(('Id', 0) in result)
 
+    def test_mpd_format_for_nonempty_track(self):
+        track = Track(
+            uri=u'a uri',
+            artists=[Artist(name=u'an artist')],
+            title=u'a title',
+            album=Album(name=u'an album', num_tracks=13),
+            track_no=7,
+            date=dt.date(1977, 1, 1),
+            length=137000,
+            id=122,
+        )
+        result = track.mpd_format(position=9)
+        self.assert_(('file', 'a uri') in result)
+        self.assert_(('Time', 137) in result)
+        self.assert_(('Artist', 'an artist') in result)
+        self.assert_(('Title', 'a title') in result)
+        self.assert_(('Album', 'an album') in result)
+        self.assert_(('Track', '7/13') in result)
+        self.assert_(('Date', dt.date(1977, 1, 1)) in result)
+        self.assert_(('Pos', 9) in result)
+        self.assert_(('Id', 122) in result)
+
     def test_mpd_format_artists(self):
         track = Track(artists=[Artist(name=u'ABBA'), Artist(name=u'Beatles')])
         self.assertEqual(track.mpd_format_artists(), u'ABBA, Beatles')
@@ -150,7 +172,7 @@ class PlaylistTest(unittest.TestCase):
             Track(track_no=1), Track(track_no=2), Track(track_no=3)])
         result = playlist.mpd_format(1, 2)
         self.assertEqual(len(result), 1)
-        self.assertEqual(dict(result[0])['Track'], '2/0')
+        self.assertEqual(dict(result[0])['Track'], 2)
 
     def test_with_new_uri(self):
         tracks = [Track()]
diff --git a/tests/mpd/handlertest.py b/tests/mpd/handlertest.py
index e9f3ec19..a6716bc2 100644
--- a/tests/mpd/handlertest.py
+++ b/tests/mpd/handlertest.py
@@ -101,7 +101,7 @@ class StatusHandlerTest(unittest.TestCase):
         self.assert_(u'Artist: ' in result)
         self.assert_(u'Title: ' in result)
         self.assert_(u'Album: ' in result)
-        self.assert_(u'Track: 0/0' in result)
+        self.assert_(u'Track: 0' in result)
         self.assert_(u'Date: ' in result)
         self.assert_(u'Pos: 0' in result)
         self.assert_(u'Id: 0' in result)