third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-16 09:20:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix detekt issues.

Browse Source 
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-07-30 22:23:20 +02:00
parent 07c2bfaeaf
commit 317ccd2ed8
24 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt
View File

@ -30,6 +30,7 @@ import java.util.TimeZone
/**
* Integration test for [SubsonicAPIClient] class.
*/
@Suppress("TooManyFunctions")
class SubsonicAPIClientTest {
companion object {
const val USERNAME = "some-user"
@ -49,7 +50,7 @@ class SubsonicAPIClientTest {
}
@Test
fun `Should pass password hash and salt in query params for api version 1_13_0`() {
fun `Should pass password hash and salt in query params for api version 1 13 0`() {
val clientV12 = SubsonicAPIClient(mockWebServerRule.mockWebServer.url("/").toString(), USERNAME,
PASSWORD, SubsonicAPIVersions.V1_14_0, CLIENT_ID)
enqueueResponse("ping_ok.json")
@ -70,7 +71,7 @@ class SubsonicAPIClientTest {
}
@Test
fun `Should pass hex encoded password in query params for api version 1_12_0`() {
fun `Should pass hex encoded password in query params for api version 1 12 0`() {
val clientV11 = SubsonicAPIClient(mockWebServerRule.mockWebServer.url("/").toString(), USERNAME,
PASSWORD, SubsonicAPIVersions.V1_12_0, CLIENT_ID)
enqueueResponse("ping_ok.json")
@ -153,7 +154,7 @@ class SubsonicAPIClientTest {
@Test
fun `Should parse get indexes ok response`() {
// TODO: check for shortcut parsing
// check for shortcut parsing
enqueueResponse("get_indexes_ok.json")
val response = client.api.getIndexes(null, null).execute()
@ -303,4 +304,4 @@ class SubsonicAPIClientTest {
version `should be` SubsonicAPIVersions.V1_13_0
error `should be` null
}
}
}

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

@ -24,4 +24,4 @@ class MockWebServerRule : TestRule {
}
return ruleStatement
}
}
}

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

@ -110,4 +110,4 @@ class SubsonicAPIClient(baseUrl: String,
this.addQueryParameter("s", salt)
}
}
}
}

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

@ -30,4 +30,4 @@ interface SubsonicAPIDefinition {
@GET("getMusicDirectory.view")
fun getMusicDirectory(@Query("id") id: Long): Call<GetMusicDirectoryResponse>
}
}

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

@ -61,4 +61,4 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion:
}
}
}
}
}

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

@ -35,4 +35,4 @@ enum class SubsonicError(val code: Int) {
}
}
}
}
}

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

@ -4,4 +4,4 @@ import java.util.Calendar
data class Artist(val id: Long,
val name: String,
val starred: Calendar?)
val starred: Calendar?)

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

@ -4,4 +4,4 @@ import com.fasterxml.jackson.annotation.JsonProperty
data class Index(val name: String,
@JsonProperty("artist")
val artists: List<Artist>)
val artists: List<Artist>)

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

@ -6,4 +6,4 @@ data class Indexes(val lastModified: Long,
val ignoredArticles: String?,
@JsonProperty("index")
val indexList: List<Index>,
val shortcuts: List<Index>?)
val shortcuts: List<Index>?)

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

@ -6,4 +6,4 @@ data class License(
val valid: Boolean = false,
val email: String = "",
val trialExpires: Calendar = Calendar.getInstance(),
val licenseExpires: Calendar = Calendar.getInstance())
val licenseExpires: Calendar = Calendar.getInstance())

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

@ -7,4 +7,4 @@ data class MusicDirectory(val id: Long,
val name: String,
val starred: Calendar?,
@JsonProperty("child")
val childList: List<MusicDirectoryChild> = emptyList())
val childList: List<MusicDirectoryChild> = emptyList())

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

@ -6,4 +6,4 @@ data class MusicDirectoryChild(val id: Long, val parent: Long, val isDir: Boolea
val title: String = "", val album: String = "",
val artist: String = "", val year: Int?,
val genre: String = "", val coverArt: Long = -1,
val created: Calendar, val starred: Calendar?)
val created: Calendar, val starred: Calendar?)

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

@ -1,3 +1,3 @@
package org.moire.ultrasonic.api.subsonic.models
data class MusicFolder(val id: Long = -1, val name: String = "")
data class MusicFolder(val id: Long = -1, val name: String = "")

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetIndexesResponse.kt
View File

@ -8,4 +8,4 @@ class GetIndexesResponse(status: Status,
version: SubsonicAPIVersions,
error: SubsonicError?,
val indexes: Indexes?) :
SubsonicResponse(status, version, error)
SubsonicResponse(status, version, error)

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetMusicDirectoryResponse.kt
View File

@ -10,4 +10,4 @@ class GetMusicDirectoryResponse(status: Status,
error: SubsonicError?,
@JsonProperty("directory")
val musicDirectory: MusicDirectory?) :
SubsonicResponse(status, version, error)
SubsonicResponse(status, version, error)

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/LicenseResponse.kt
View File

@ -8,4 +8,4 @@ class LicenseResponse(val license: License = License(),
status: Status,
version: SubsonicAPIVersions,
error: SubsonicError?) :
SubsonicResponse(status, version, error)
SubsonicResponse(status, version, error)

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt
View File

@ -30,4 +30,4 @@ class MusicFoldersResponse(status: Status,
}
}
}
}
}

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt
View File

@ -36,4 +36,4 @@ open class SubsonicResponse(val status: Status,
}
}
}
}
}

2
subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersionsDeserializerTest.kt
View File

@ -41,4 +41,4 @@ class SubsonicAPIVersionsDeserializerTest {
parsedVersion `should be` SubsonicAPIVersions.V1_13_0
}
}
}

2
subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersionsTest.kt
View File

@ -25,4 +25,4 @@ class SubsonicAPIVersionsTest(private val apiVersion: SubsonicAPIVersions) {
fun `Should throw IllegalArgumentException for unknown api version`() {
SubsonicAPIVersions.fromApiVersion(apiVersion.restApiVersion.substring(0, 2))
}
}
}

2
subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicErrorTest.kt
View File

@ -25,4 +25,4 @@ class SubsonicErrorTest(private val error: SubsonicError) {
fun `Should throw IllegalArgumentException from unknown error code`() {
SubsonicError.parseErrorFromJson(error.code + 10000)
}
}
}

2
subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/models/StatusTest.kt
View File

@ -26,4 +26,4 @@ class StatusTest(private val status: SubsonicResponse.Status) {
fun `Should throw IllegalArgumentException on unknown status`() {
SubsonicResponse.Status.getStatusFromJson(status.jsonValue.plus("-some"))
}
}
}

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

@ -12,4 +12,4 @@ fun convertMusicFolder(entity: APIMusicFolder): MusicFolder {
fun convertMusicFolderList(entitiesList: List<APIMusicFolder>): List<MusicFolder> {
return entitiesList.map { convertMusicFolder(it) }
}
}

2
ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
View File

@ -40,4 +40,4 @@ class APIConverterTest {
private fun createMusicFolder(id: Long = 0, name: String = ""): MusicFolder =
MusicFolder(id, name)
}
}