Changeset 102

Timestamp:

07/06/08 13:32:37 (5 months ago)

Author:

chris

Message:

Fixes #55/#69: The last entry in the iTunesDB was not being read and therefore
was never check for 'Play Counts'

Files:

• trunk/src/main/org/lastpod/parser/PlayCountsParser.java (modified) (1 diff)
• trunk/src/test/Play Counts (modified) (previous)
• trunk/src/test/org/lastpod/DbReaderTest.java (modified) (3 diffs)
• trunk/src/test/org/lastpod/parser/MockItunesDbParser.java (modified) (1 diff)

trunk/src/main/org/lastpod/parser/PlayCountsParser.java

@@ -155 +155 @@
-        IoUtils.skipFully(playcountsistream, 80); //skip rest of header
-
-(numentries - 1)
+numentries
-            playcountsistream.mark(1048576); //save beginning of entry location
-

trunk/src/test/org/lastpod/DbReaderTest.java

@@ -64 +64 @@
-        }
-
-5
+6
-
-4
+5
-        assertEquals(20598, track.getTrackid());
-        assertEquals(427, track.getLength());
@@ -96 +96 @@
-        }
-
-7
+8
-
-4
-8
-427
-Bob Marley
-Legend
- (live)
+3
+9
+1000
+Chris Tilden
+Chris Tilden
+
-        assertEquals(1, track.getPlaycount());
-        /* Fails for some reason */
-        //        assertEquals(1181414106, track.getLastplayed());
-
-        track = (TrackItem) recentlyPlayed.get(15);
-        assertEquals(20598, track.getTrackid());
@@ -126 +125 @@
-        /* Fails for some reason */
-        //        assertEquals(1181493951, track.getLastplayed());
+        track = (TrackItem) recentlyPlayed.get(17);
+        assertEquals(20598, track.getTrackid());
+        assertEquals(427, track.getLength());
+        assertEquals("Bob Marley & The Wailers", track.getArtist());
+        assertEquals("Legend", track.getAlbum());
+        assertEquals("No Woman, No Cry (live)", track.getTrack());
+        assertEquals(1, track.getPlaycount());
+
+        /* Fails for some reason */
+        //        assertEquals(1181494378, track.getLastplayed());
-    }
-}

trunk/src/test/org/lastpod/parser/MockItunesDbParser.java

@@ -64 +64 @@
-        trackItem.setTrack("No Woman, No Cry (live)");
-
+        trackItem = (TrackItem) trackList.get(2616);
+        trackItem.setTrackid(20599);
+        trackItem.setLength(1000);
+        trackItem.setArtist("Chris Tilden & The Wailers");
+        trackItem.setAlbum("Chris Tilden");
+        trackItem.setTrack("No Woman, No Cry");
+
-        return trackList;
-    }