Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Change artist id type to String. 

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-12-16 19:50:57 +01:00
parent 66d7973c5a
commit a694f895e9
12 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetArtistTest.kt
View File

@ -39,7 +39,7 @@ class SubsonicApiGetArtistTest : SubsonicAPIClientTest() {
assertResponseSuccessful(response) assertResponseSuccessful(response)
with(response.body().artist) { with(response.body().artist) {
id `should equal to` 362L id `should equal to` "362"
name `should equal to` "AC/DC" name `should equal to` "AC/DC"
coverArt `should equal to` "ar-362" coverArt `should equal to` "ar-362"
albumCount `should equal to` 2 albumCount `should equal to` 2

8
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetArtistsTest.kt
View File

@ -36,12 +36,12 @@ class SubsonicApiGetArtistsTest : SubsonicAPIClientTest() {
indexList.size `should equal to` 2 indexList.size `should equal to` 2
indexList `should equal` listOf( indexList `should equal` listOf(
Index(name = "A", artists = listOf( Index(name = "A", artists = listOf(
Artist(id = 362L, name = "AC/DC", coverArt = "ar-362", albumCount = 2), Artist(id = "362", name = "AC/DC", coverArt = "ar-362", albumCount = 2),
Artist(id = 254L, name = "Acceptance", coverArt = "ar-254", albumCount = 1) Artist(id = "254", name = "Acceptance", coverArt = "ar-254", albumCount = 1)
)), )),
Index(name = "T", artists = listOf( Index(name = "T", artists = listOf(
Artist(id = 516L, name = "Tangerine Dream", coverArt = "ar-516", albumCount = 1), Artist(id = "516", name = "Tangerine Dream", coverArt = "ar-516", albumCount = 1),
Artist(id = 242L, name = "Taproot", coverArt = "ar-242", albumCount = 2) Artist(id = "242", name = "Taproot", coverArt = "ar-242", albumCount = 2)
)) ))
) )
} }

12
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetIndexesTest.kt
View File

@ -23,18 +23,18 @@ class SubsonicApiGetIndexesTest : SubsonicAPIClientTest() {
lastModified `should equal` 1491069027523 lastModified `should equal` 1491069027523
ignoredArticles `should equal` "The El La Los Las Le Les" ignoredArticles `should equal` "The El La Los Las Le Les"
shortcutList `should equal` listOf( shortcutList `should equal` listOf(
Artist(id = 889L, name = "podcasts"), Artist(id = "889", name = "podcasts"),
Artist(id = 890L, name = "audiobooks") Artist(id = "890", name = "audiobooks")
) )
indexList `should equal` mutableListOf( indexList `should equal` mutableListOf(
Index("A", listOf( Index("A", listOf(
Artist(id = 50L, name = "Ace Of Base", Artist(id = "50", name = "Ace Of Base",
starred = parseDate("2017-04-02T20:16:29.815Z")), starred = parseDate("2017-04-02T20:16:29.815Z")),
Artist(id = 379L, name = "A Perfect Circle") Artist(id = "379", name = "A Perfect Circle")
)), )),
Index("H", listOf( Index("H", listOf(
Artist(id = 299, name = "Haddaway"), Artist(id = "299", name = "Haddaway"),
Artist(id = 297, name = "Halestorm") Artist(id = "297", name = "Halestorm")
)) ))
) )
} }

2
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetStarred2Test.kt
View File

@ -30,7 +30,7 @@ class SubsonicApiGetStarred2Test : SubsonicAPIClientTest() {
with(response.body().starred2) { with(response.body().starred2) {
albumList `should equal` emptyList() albumList `should equal` emptyList()
artistList.size `should equal to` 1 artistList.size `should equal to` 1
artistList[0] `should equal` Artist(id = 364, name = "Parov Stelar", artistList[0] `should equal` Artist(id = "364", name = "Parov Stelar",
starred = parseDate("2017-08-12T18:32:58.768Z")) starred = parseDate("2017-08-12T18:32:58.768Z"))
songList `should equal` emptyList() songList `should equal` emptyList()
} }

2
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetStarredTest.kt
View File

@ -29,7 +29,7 @@ class SubsonicApiGetStarredTest : SubsonicAPIClientTest() {
with(response.body().starred) { with(response.body().starred) {
albumList `should equal` emptyList() albumList `should equal` emptyList()
artistList.size `should equal to` 1 artistList.size `should equal to` 1
artistList[0] `should equal` Artist(id = 364, name = "Parov Stelar", artistList[0] `should equal` Artist(id = "364", name = "Parov Stelar",
starred = parseDate("2017-08-12T18:32:58.768Z")) starred = parseDate("2017-08-12T18:32:58.768Z"))
songList `should equal` emptyList() songList `should equal` emptyList()
} }

2
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiSearchThreeTest.kt
View File

@ -32,7 +32,7 @@ class SubsonicApiSearchThreeTest : SubsonicAPIClientTest() {
assertResponseSuccessful(response) assertResponseSuccessful(response)
with(response.body().searchResult) { with(response.body().searchResult) {
artistList.size `should equal to` 1 artistList.size `should equal to` 1
artistList[0] `should equal` Artist(id = 505, name = "The Prodigy", coverArt = "ar-505", artistList[0] `should equal` Artist(id = "505", name = "The Prodigy", coverArt = "ar-505",
albumCount = 5) albumCount = 5)
albumList.size `should equal to` 1 albumList.size `should equal to` 1
albumList[0] `should equal` Album(id = 855, name = "Always Outnumbered, Never Outgunned", albumList[0] `should equal` Album(id = 855, name = "Always Outnumbered, Never Outgunned",

2
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiSearchTwoTest.kt
View File

@ -31,7 +31,7 @@ class SubsonicApiSearchTwoTest : SubsonicAPIClientTest() {
assertResponseSuccessful(response) assertResponseSuccessful(response)
with(response.body().searchResult) { with(response.body().searchResult) {
artistList.size `should equal to` 1 artistList.size `should equal to` 1
artistList[0] `should equal` Artist(id = 522, name = "The Prodigy") artistList[0] `should equal` Artist(id = "522", name = "The Prodigy")
albumList.size `should equal to` 1 albumList.size `should equal to` 1
albumList[0] `should equal` MusicDirectoryChild(id = 8867, parent = 522, isDir = true, albumList[0] `should equal` MusicDirectoryChild(id = 8867, parent = 522, isDir = true,
title = "Always Outnumbered, Never Outgunned", title = "Always Outnumbered, Never Outgunned",

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/Artist.kt
View File

@ -3,7 +3,7 @@ package org.moire.ultrasonic.api.subsonic.models
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import java.util.Calendar import java.util.Calendar
data class Artist(val id: Long = -1, data class Artist(val id: String = "",
val name: String = "", val name: String = "",
val coverArt: String = "", val coverArt: String = "",
val albumCount: Int = 0, val albumCount: Int = 0,

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIArtistConverter.kt
View File

@ -8,7 +8,7 @@ import org.moire.ultrasonic.domain.MusicDirectory
import org.moire.ultrasonic.api.subsonic.models.Artist as APIArtist import org.moire.ultrasonic.api.subsonic.models.Artist as APIArtist
fun APIArtist.toDomainEntity(): Artist = Artist().apply { fun APIArtist.toDomainEntity(): Artist = Artist().apply {
id = this@toDomainEntity.id.toString() id = this@toDomainEntity.id
name = this@toDomainEntity.name name = this@toDomainEntity.name
} }

4
ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIArtistConverterTest.kt
View File

@ -15,7 +15,7 @@ import java.util.Calendar
class APIArtistConverterTest { class APIArtistConverterTest {
@Test @Test
fun `Should convert artist entity`() { fun `Should convert artist entity`() {
val entity = Artist(id = 10, name = "artist-name", starred = Calendar.getInstance()) val entity = Artist(id = "10", name = "artist-name", starred = Calendar.getInstance())
val convertedEntity = entity.toDomainEntity() val convertedEntity = entity.toDomainEntity()
@ -27,7 +27,7 @@ class APIArtistConverterTest {
@Test @Test
fun `Should convert Artist entity to domain MusicDirectory entity`() { fun `Should convert Artist entity to domain MusicDirectory entity`() {
val entity = Artist(id = 101L, name = "artist-name", coverArt = "some-art", albumCount = 10, val entity = Artist(id = "101", name = "artist-name", coverArt = "some-art", albumCount = 10,
albumsList = listOf(Album(id = 562L, name = "some-name", coverArt = "zzz", albumsList = listOf(Album(id = 562L, name = "some-name", coverArt = "zzz",
artist = "artist-name", artistId = 256L, songCount = 10, duration = 345, artist = "artist-name", artistId = 256L, songCount = 10, duration = 345,
created = Calendar.getInstance(), year = 2011, genre = "Math Rock"))) created = Calendar.getInstance(), year = 2011, genre = "Math Rock")))

8
ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIIndexesConverterTest.kt
View File

@ -16,11 +16,11 @@ class APIIndexesConverterTest {
@Test @Test
fun `Should convert Indexes entity`() { fun `Should convert Indexes entity`() {
val artistsA = listOf( val artistsA = listOf(
Artist(id =4, name = "AC/DC"), Artist(id ="4", name = "AC/DC"),
Artist(id =45, name = "ABBA")) Artist(id ="45", name = "ABBA"))
val artistsT = listOf( val artistsT = listOf(
Artist(id = 10, name = "Taproot"), Artist(id = "10", name = "Taproot"),
Artist(id = 12, name = "Teebee")) Artist(id = "12", name = "Teebee"))
val entity = Indexes(lastModified = 154, ignoredArticles = "Le Tre Ze", indexList = listOf( val entity = Indexes(lastModified = 154, ignoredArticles = "Le Tre Ze", indexList = listOf(
Index(name = "A", artists = artistsA), Index(name = "A", artists = artistsA),
Index(name = "T", artists = artistsT) Index(name = "T", artists = artistsT)

4
ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APISearchConverterTest.kt
View File

@ -38,7 +38,7 @@ class APISearchConverterTest {
@Test @Test
fun `Should convert SearchTwoResult to domain entity`() { fun `Should convert SearchTwoResult to domain entity`() {
val entity = SearchTwoResult(listOf( val entity = SearchTwoResult(listOf(
Artist(id = 82, name = "great-artist-name") Artist(id = "82", name = "great-artist-name")
), listOf( ), listOf(
MusicDirectoryChild(id = 762, artist = "bzz") MusicDirectoryChild(id = 762, artist = "bzz")
), listOf( ), listOf(
@ -60,7 +60,7 @@ class APISearchConverterTest {
@Test @Test
fun `Should convert SearchThreeResult to domain entity`() { fun `Should convert SearchThreeResult to domain entity`() {
val entity = SearchThreeResult( val entity = SearchThreeResult(
artistList = listOf(Artist(id = 612, name = "artist1")), artistList = listOf(Artist(id = "612", name = "artist1")),
albumList = listOf(Album(id = 221, name = "album1")), albumList = listOf(Album(id = 221, name = "album1")),
songList = listOf(MusicDirectoryChild(id = 7123, title = "song1")) songList = listOf(MusicDirectoryChild(id = 7123, title = "song1"))
) )