Changeset 86

Timestamp:

12/23/07 00:38:08 (1 year ago)

Author:

chris

Message:

Completes #48: Added a check to make sure the title of the tracks
contains a "-" character. If not, then do not try and parse the track.

Files:

• trunk/src/main/org/lastpod/TrackItem.java (modified) (1 diff)
• trunk/src/test/org/lastpod/TrackItemTest.java (modified) (1 diff)

trunk/src/main/org/lastpod/TrackItem.java

@@ -137 +137 @@
-        }
-
+        /* If the track does not contain a "-" character, then do not parse it
+         * as a various artists track. */
+        if (!track.contains("-")) {
+            return false;
+        }
+
-        /* In addition to other checks, this makes sure the track is not null,
-         * because track will need to be parsed. */

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

@@ -147 +147 @@
-
-    /**
+     * Tests a "Various Artists" track that does not have a dash character.
+     */
+    public void testVariousArtistsTrackWithoutDash() {
+        TrackItem trackItem = new TrackItem();
+        trackItem.setTrackid(1);
+        trackItem.setActive(Boolean.TRUE);
+        trackItem.setLength(60);
+        trackItem.setArtist("Various Artists");
+        trackItem.setAlbum("Italo Disco Collection - Vol.");
+        trackItem.setTrack("Raff / Self control");
+        trackItem.setPlaycount(1);
+        trackItem.setLastplayed(1);
+        trackItem.setParseVariousArtists(true);
+        trackItem.setVariousArtistsStrings(VARIOUS_ARTISTS_STRING);
+
+        assertFalse(trackItem.isVariousArtistAlbum(true, VARIOUS_ARTISTS_STRING));
+        assertFalse(trackItem.isVariousArtistAlbum(false, VARIOUS_ARTISTS_STRING));
+        assertEquals("Various Artists", trackItem.getArtist());
+        assertEquals("Italo Disco Collection - Vol.", trackItem.getAlbum());
+        assertEquals("Raff / Self control", trackItem.getTrack());
+    }
+
+    /**
-     * Tests a "Various Artists" __Compilations track.
-     */