fix unit tests and add Track#copyWithUserData

lavalink-devs · Nov 26, 2023 · 4720192 · 4720192
1 parent 0ce1ed2
commit 4720192
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt b/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt
@@ -25,7 +25,11 @@ data class Track(
     val info: TrackInfo,
     val pluginInfo: JsonObject,
     val userData: JsonObject
-) : LoadResult.Data
+) : LoadResult.Data {
+    fun copyWithUserData(userData: JsonObject): Track {
+        return copy(userData = userData)
+    }
+}
 
 @Serializable
 @JvmInline

diff --git a/protocol/src/commonTest/kotlin/LoadResultSerializerTest.kt b/protocol/src/commonTest/kotlin/LoadResultSerializerTest.kt
@@ -29,7 +29,8 @@ class LoadResultSerializerTest {
                     "isrc": null,
                     "sourceName": "youtube"
                   },
-                  "pluginInfo": {}
+                  "pluginInfo": {},
+                  "userData": {}
               },
               "exception": null
             }

diff --git a/protocol/src/commonTest/kotlin/MessageSerializerTest.kt b/protocol/src/commonTest/kotlin/MessageSerializerTest.kt
@@ -130,7 +130,8 @@ class MessageSerializerTest {
                   "isrc": null,
                   "sourceName": "youtube"
                 },
-                "pluginInfo": {}
+                "pluginInfo": {},
+                "userData": {}
               }
             }
         """.trimIndent()
@@ -183,7 +184,8 @@ class MessageSerializerTest {
                   "isrc": null,
                   "sourceName": "youtube"
                 },
-                "pluginInfo": {}
+                "pluginInfo": {},
+                "userData": {}
               },
               "reason": "finished"
             }
@@ -238,7 +240,8 @@ class MessageSerializerTest {
                   "isrc": null,
                   "sourceName": "youtube"
                 },
-                "pluginInfo": {}
+                "pluginInfo": {},
+                "userData": {}
               },
               "exception": {
                 "message": "...",
@@ -301,7 +304,8 @@ class MessageSerializerTest {
                   "isrc": null,
                   "sourceName": "youtube"
                 },
-                "pluginInfo": {}
+                "pluginInfo": {},
+                "userData": {}
               },
               "thresholdMs": 123456789
             }

diff --git a/protocol/src/commonTest/kotlin/PlayerSerializerTest.kt b/protocol/src/commonTest/kotlin/PlayerSerializerTest.kt
@@ -27,7 +27,8 @@ private const val json = """
         "artworkUrl": null,
         "isrc": null
       },
-      "pluginInfo": {}
+      "pluginInfo": {},
+      "userData": {}
     },
     "volume": 100,
     "paused": false,
@@ -52,7 +53,9 @@ private const val json = """
 //language=json
 const val updateJson = """
 {
-  "identifier": "...",
+  "track": {
+    "identifier": "..."
+  },
   "endTime": 0,
   "volume": 100,
   "position": 32400,
@@ -112,8 +115,7 @@ class PlayerSerializerTest {
         val json = """{}"""
 
         test<PlayerUpdate>(json) {
-            assertIs<Omissible.Omitted<*>>(encodedTrack)
-            assertIs<Omissible.Omitted<*>>(identifier)
+            assertIs<Omissible.Omitted<*>>(track)
             assertIs<Omissible.Omitted<*>>(position)
             assertIs<Omissible.Omitted<*>>(endTime)
             assertIs<Omissible.Omitted<*>>(volume)
@@ -127,7 +129,7 @@ class PlayerSerializerTest {
     @JsName("test3")
     fun `test encodedTrack and identifier exclusivity`() {
         //language=json
-        val json = """{"encodedTrack":  "", "identifier":  ""}"""
+        val json = """{"track": {"encodedTrack":  "", "identifier":  ""}}"""
 
         assertFailsWith<IllegalArgumentException> { Json.decodeFromString(json) }
     }
@@ -136,7 +138,9 @@ class PlayerSerializerTest {
     @JsName("test4")
     fun `test update player serialization`() {
         test<PlayerUpdate>(updateJson) {
-            identifier shouldBe "..."
+            track.requirePresent {
+                identifier shouldBe "..."
+            }
             endTime shouldBe 0
             volume shouldBe 100
             position shouldBe 32400