Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-17 04:00:39 +01:00
Code Issues Releases Wiki Activity

Fixed some more warnings

Browse Source
This commit is contained in:
Nite 2021-05-07 15:55:03 +02:00
parent e37791e37c
commit 0b2a62f391
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt vendored
View File

@ -3,7 +3,6 @@ package org.moire.ultrasonic.cache
import java.io.File import java.io.File
import org.amshove.kluent.`should be equal to` import org.amshove.kluent.`should be equal to`
import org.amshove.kluent.`should contain` import org.amshove.kluent.`should contain`
import org.amshove.kluent.`should equal`
import org.junit.Test import org.junit.Test
import org.moire.ultrasonic.cache.serializers.getMusicFolderSerializer import org.moire.ultrasonic.cache.serializers.getMusicFolderSerializer
import org.moire.ultrasonic.domain.MusicFolder import org.moire.ultrasonic.domain.MusicFolder
@ -44,7 +43,7 @@ class PermanentFileStorageTest : BaseStorageTest() {
val loadedItem = storage.load(name, getMusicFolderSerializer()) val loadedItem = storage.load(name, getMusicFolderSerializer())
loadedItem `should equal` item loadedItem `should be equal to` item
} }
@Test @Test
@ -57,7 +56,7 @@ class PermanentFileStorageTest : BaseStorageTest() {
val loadedItem = storage.load(name, getMusicFolderSerializer()) val loadedItem = storage.load(name, getMusicFolderSerializer())
loadedItem `should equal` item2 loadedItem `should be equal to` item2
} }
@Test @Test
@ -74,7 +73,7 @@ class PermanentFileStorageTest : BaseStorageTest() {
fun `Should return null if serialized file not available`() { fun `Should return null if serialized file not available`() {
val loadedItem = storage.load("some-name", getMusicFolderSerializer()) val loadedItem = storage.load("some-name", getMusicFolderSerializer())
loadedItem `should equal` null loadedItem `should be equal to` null
} }
private fun getServerStorageDir() = File(storageDir, serverId) private fun getServerStorageDir() = File(storageDir, serverId)

6
core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt vendored
View File

@ -1,6 +1,6 @@
package org.moire.ultrasonic.cache.serializers package org.moire.ultrasonic.cache.serializers
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should be equal to`
import org.junit.Test import org.junit.Test
import org.moire.ultrasonic.cache.BaseStorageTest import org.moire.ultrasonic.cache.BaseStorageTest
import org.moire.ultrasonic.domain.Artist import org.moire.ultrasonic.domain.Artist
@ -26,7 +26,7 @@ class ArtistSerializerTest : BaseStorageTest() {
val loadedItem = storage.load(itemName, getArtistsSerializer()) val loadedItem = storage.load(itemName, getArtistsSerializer())
loadedItem `should equal` item loadedItem `should be equal to` item
} }
@Test @Test
@ -52,6 +52,6 @@ class ArtistSerializerTest : BaseStorageTest() {
val loadedItems = storage.load(name, getArtistListSerializer()) val loadedItems = storage.load(name, getArtistListSerializer())
loadedItems `should equal` itemsList loadedItems `should be equal to` itemsList
} }
} }

4
core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt vendored
View File

@ -1,6 +1,6 @@
package org.moire.ultrasonic.cache.serializers package org.moire.ultrasonic.cache.serializers
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should be equal to`
import org.junit.Test import org.junit.Test
import org.moire.ultrasonic.cache.BaseStorageTest import org.moire.ultrasonic.cache.BaseStorageTest
import org.moire.ultrasonic.domain.Artist import org.moire.ultrasonic.domain.Artist
@ -33,6 +33,6 @@ class IndexesSerializerTest : BaseStorageTest() {
val loadedItem = storage.load(name, getIndexesSerializer()) val loadedItem = storage.load(name, getIndexesSerializer())
loadedItem `should equal` item loadedItem `should be equal to` item
} }
} }

6
core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt vendored
View File

@ -1,6 +1,6 @@
package org.moire.ultrasonic.cache.serializers package org.moire.ultrasonic.cache.serializers
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should be equal to`
import org.junit.Test import org.junit.Test
import org.moire.ultrasonic.cache.BaseStorageTest import org.moire.ultrasonic.cache.BaseStorageTest
import org.moire.ultrasonic.domain.MusicFolder import org.moire.ultrasonic.domain.MusicFolder
@ -26,7 +26,7 @@ class MusicFolderSerializerTest : BaseStorageTest() {
val loadedItem = storage.load(name, getMusicFolderSerializer()) val loadedItem = storage.load(name, getMusicFolderSerializer())
loadedItem `should equal` item loadedItem `should be equal to` item
} }
@Test @Test
@ -52,6 +52,6 @@ class MusicFolderSerializerTest : BaseStorageTest() {
val loadedItem = storage.load(name, getMusicFolderListSerializer()) val loadedItem = storage.load(name, getMusicFolderListSerializer())
loadedItem `should equal` itemsList loadedItem `should be equal to` itemsList
} }
} }

5
core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetAvatarTest.kt
View File

@ -3,7 +3,6 @@ package org.moire.ultrasonic.api.subsonic
import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockResponse
import org.amshove.kluent.`should be equal to` import org.amshove.kluent.`should be equal to`
import org.amshove.kluent.`should be` import org.amshove.kluent.`should be`
import org.amshove.kluent.`should equal`
import org.amshove.kluent.`should not be` import org.amshove.kluent.`should not be`
import org.junit.Test import org.junit.Test
@ -20,7 +19,7 @@ class SubsonicApiGetAvatarTest : SubsonicAPIClientTest() {
with(response) { with(response) {
stream `should be` null stream `should be` null
responseHttpCode `should be equal to` 200 responseHttpCode `should be equal to` 200
apiError `should equal` SubsonicError.RequestedDataWasNotFound apiError `should be equal to` SubsonicError.RequestedDataWasNotFound
} }
} }
@ -32,7 +31,7 @@ class SubsonicApiGetAvatarTest : SubsonicAPIClientTest() {
val response = client.getAvatar("some") val response = client.getAvatar("some")
with(response) { with(response) {
stream `should equal` null stream `should be equal to` null
responseHttpCode `should be equal to` httpErrorCode responseHttpCode `should be equal to` httpErrorCode
apiError `should be` null apiError `should be` null
} }

5
core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt
View File

@ -1,7 +1,6 @@
package org.moire.ultrasonic.api.subsonic package org.moire.ultrasonic.api.subsonic
import org.amshove.kluent.`should be equal to` import org.amshove.kluent.`should be equal to`
import org.amshove.kluent.`should equal`
import org.amshove.kluent.`should not be` import org.amshove.kluent.`should not be`
import org.junit.Test import org.junit.Test
import org.moire.ultrasonic.api.subsonic.models.Playlist import org.moire.ultrasonic.api.subsonic.models.Playlist
@ -17,7 +16,7 @@ class SubsonicApiGetPlaylistsTest : SubsonicAPIClientTest() {
} }
response.playlists `should not be` null response.playlists `should not be` null
response.playlists `should equal` emptyList() response.playlists `should be equal to` emptyList()
} }
@Test @Test
@ -29,7 +28,7 @@ class SubsonicApiGetPlaylistsTest : SubsonicAPIClientTest() {
assertResponseSuccessful(response) assertResponseSuccessful(response)
with(response.body()!!.playlists) { with(response.body()!!.playlists) {
size `should be equal to` 1 size `should be equal to` 1
this[0] `should equal` Playlist( this[0] `should be equal to` Playlist(
id = "0", name = "Aug 27, 2017 11:17 AM", id = "0", name = "Aug 27, 2017 11:17 AM",
owner = "admin", public = false, songCount = 16, duration = 3573, owner = "admin", public = false, songCount = 16, duration = 3573,
comment = "Some comment", comment = "Some comment",