From 8899260977ffe6aaf683ea682b88cab5ad681ce0 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Sun, 20 Aug 2017 21:14:09 +0200
Subject: [PATCH] Change cover art to be a string.
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
.../api/subsonic/SubsonicApiGetMusicDirectoryTest.kt | 4 ++--
.../ultrasonic/api/subsonic/models/MusicDirectoryChild.kt | 2 +-
.../test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetMusicDirectoryTest.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetMusicDirectoryTest.kt
index 09c7cbc0..8ec74983 100644
--- a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetMusicDirectoryTest.kt
+++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetMusicDirectoryTest.kt
@@ -61,14 +61,14 @@ class SubsonicApiGetMusicDirectoryTest : SubsonicAPIClientTest() {
childList.size `should be` 2
childList[0] `should equal` MusicDirectoryChild(id = 4844L, parent = 4836L, isDir = false,
title = "Crash", album = "12 Stones", artist = "12 Stones", track = 1, year = 2002,
- genre = "Alternative Rock", coverArt = 4836L, size = 5348318L,
+ genre = "Alternative Rock", coverArt = "4836", size = 5348318L,
contentType = "audio/mpeg", suffix = "mp3", duration = 222, bitRate = 192,
path = "12 Stones/12 Stones/01 Crash.mp3", isVideo = false, playCount = 0,
discNumber = 1, created = parseDate("2016-10-23T15:19:10.000Z"),
albumId = 454L, artistId = 288L, type = "music")
childList[1] `should equal` MusicDirectoryChild(id = 4845L, parent = 4836L, isDir = false,
title = "Broken", album = "12 Stones", artist = "12 Stones", track = 2, year = 2002,
- genre = "Alternative Rock", coverArt = 4836L, size = 4309043L,
+ genre = "Alternative Rock", coverArt = "4836", size = 4309043L,
contentType = "audio/mpeg", suffix = "mp3", duration = 179, bitRate = 192,
path = "12 Stones/12 Stones/02 Broken.mp3", isVideo = false, playCount = 0,
discNumber = 1, created = parseDate("2016-10-23T15:19:09.000Z"),
diff --git a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicDirectoryChild.kt b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicDirectoryChild.kt
index 4c2070f7..d1f01c3f 100644
--- a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicDirectoryChild.kt
+++ b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicDirectoryChild.kt
@@ -11,7 +11,7 @@ data class MusicDirectoryChild(val id: Long = -1L,
val track: Int = -1,
val year: Int? = null,
val genre: String = "",
- val coverArt: Long? = null,
+ val coverArt: String = "",
val size: Long = -1,
val contentType: String = "",
val suffix: String = "",
diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
index 1a7f9465..b15e7456 100644
--- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
+++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
@@ -101,7 +101,7 @@ class APIConverterTest {
fun `Should convert MusicDirectoryChild entity`() {
val entity = MusicDirectoryChild(id = 929L, parent = 11L, title = "some-title",
album = "some-album", albumId = 231L, artist = "some-artist", artistId = 1233L,
- track = 12, year = 2002, genre = "some-genre", coverArt = 952L, size = 9418123L,
+ track = 12, year = 2002, genre = "some-genre", coverArt = "952", size = 9418123L,
contentType = "some-content-type", suffix = "some-suffix",
transcodedContentType = "some-transcoded-content-type",
transcodedSuffix = "some-transcoded-suffix", duration = 11, bitRate = 256,
@@ -126,7 +126,7 @@ class APIConverterTest {
suffix `should equal to` entity.suffix
transcodedContentType `should equal to` entity.transcodedContentType
transcodedSuffix `should equal to` entity.transcodedSuffix
- coverArt `should equal to` entity.coverArt.toString()
+ coverArt `should equal to` entity.coverArt
size `should equal to` entity.size
duration `should equal to` entity.duration
bitRate `should equal to` entity.bitRate