From 0f42ee20ccae88f24de50af17848f16cc2b7f811 Mon Sep 17 00:00:00 2001 From: Nite Date: Thu, 27 Aug 2020 11:02:33 +0200 Subject: [PATCH] Fixed ktlint errors --- .../VersionAwareJacksonConverterFactoryTest.kt | 16 +++++++--------- .../interceptors/VersionInterceptorTest.kt | 2 -- .../api/subsonic/SubsonicAPIVersions.kt | 2 +- .../api/subsonic/SubsonicAPIVersionsTest.kt | 8 ++++++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactoryTest.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactoryTest.kt index 0f313243..c0403d06 100644 --- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactoryTest.kt +++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactoryTest.kt @@ -1,7 +1,5 @@ package org.moire.ultrasonic.api.subsonic -import com.fasterxml.jackson.databind.ObjectMapper -import okhttp3.mockwebserver.MockResponse import org.amshove.kluent.`should be` import org.junit.Before import org.junit.Test @@ -9,18 +7,18 @@ import org.junit.Test /** * Integration test for [VersionAwareJacksonConverterFactory]. */ -class VersionAwareJacksonConverterFactoryTest : SubsonicAPIClientTest() { +class VersionAwareJacksonConverterFactoryTest : SubsonicAPIClientTest() { private val initialProtocolVersion = SubsonicAPIVersions.V1_1_0 private var updatedProtocolVersion = SubsonicAPIVersions.V1_1_0 @Before override fun setUp() { config = SubsonicClientConfiguration( - mockWebServerRule.mockWebServer.url("/").toString(), - USERNAME, - PASSWORD, - initialProtocolVersion, - CLIENT_ID + mockWebServerRule.mockWebServer.url("/").toString(), + USERNAME, + PASSWORD, + initialProtocolVersion, + CLIENT_ID ) client = SubsonicAPIClient(config) } @@ -51,4 +49,4 @@ class VersionAwareJacksonConverterFactoryTest : SubsonicAPIClientTest() { client.protocolVersion.`should be`(initialProtocolVersion) } -} \ No newline at end of file +} diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptorTest.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptorTest.kt index 9885a455..2764e4ce 100644 --- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptorTest.kt +++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptorTest.kt @@ -2,9 +2,7 @@ package org.moire.ultrasonic.api.subsonic.interceptors import kotlin.LazyThreadSafetyMode.NONE import okhttp3.Interceptor -import okhttp3.mockwebserver.MockResponse import org.amshove.kluent.`should contain` -import org.amshove.kluent.`should equal` import org.junit.Test import org.moire.ultrasonic.api.subsonic.SubsonicAPIVersions import org.moire.ultrasonic.api.subsonic.enqueueResponse diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt index 5e4a6146..fbdc27c4 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt @@ -41,7 +41,7 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion: val majorVersion = versionComponents[0].toInt() val minorVersion = versionComponents[1].toInt() val patchVersion = if (versionComponents.size > 2) versionComponents[2].toInt() - else 0 + else 0 when (majorVersion) { 1 -> when { diff --git a/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersionsTest.kt b/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersionsTest.kt index 0e2ed81f..4fcdcf1e 100644 --- a/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersionsTest.kt +++ b/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersionsTest.kt @@ -18,11 +18,15 @@ class SubsonicAPIVersionsTest(private val apiVersion: SubsonicAPIVersions) { @Test fun `Should proper convert api version to enum`() { - SubsonicAPIVersions.getClosestKnownClientApiVersion(apiVersion.restApiVersion) `should equal` apiVersion + SubsonicAPIVersions.getClosestKnownClientApiVersion( + apiVersion.restApiVersion + ) `should equal` apiVersion } @Test(expected = IllegalArgumentException::class) fun `Should throw IllegalArgumentException for unknown api version`() { - SubsonicAPIVersions.getClosestKnownClientApiVersion(apiVersion.restApiVersion.substring(0, 2)) + SubsonicAPIVersions.getClosestKnownClientApiVersion( + apiVersion.restApiVersion.substring(0, 2) + ) } }