Skip to content

Commit d61ebca

Browse files
authored
Fix test pollution in RoomServiceClientTest (#122)
1 parent ac6ac00 commit d61ebca

File tree

1 file changed

+35
-22
lines changed

1 file changed

+35
-22
lines changed
Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 LiveKit, Inc.
2+
* Copyright 2024-2025 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ package io.livekit.server
1818

1919
import io.livekit.server.okhttp.OkHttpFactory
2020
import livekit.LivekitModels
21+
import java.util.UUID
22+
import kotlin.test.AfterTest
2123
import kotlin.test.BeforeTest
2224
import kotlin.test.Ignore
2325
import kotlin.test.Test
@@ -31,59 +33,68 @@ class RoomServiceClientTest {
3133
const val HOST = TestConstants.HOST
3234
const val KEY = TestConstants.KEY
3335
const val SECRET = TestConstants.SECRET
34-
35-
const val ROOM_NAME = "room_name"
36-
const val METADATA = "metadata"
3736
}
3837

3938
lateinit var client: RoomServiceClient
39+
lateinit var roomName: String
4040

4141
@BeforeTest
4242
fun setup() {
4343
client = RoomServiceClient.createClient(HOST, KEY, SECRET, OkHttpFactory(true, null))
44+
roomName = "test_room_${UUID.randomUUID()}"
45+
}
46+
47+
@AfterTest
48+
fun cleanup() {
49+
try {
50+
client.deleteRoom(roomName).execute()
51+
} catch (e: Exception) {
52+
// Ignore cleanup errors
53+
}
4454
}
4555

4656
@Test
4757
fun createRoom() {
58+
val metadata = "metadata"
4859
val response = client.createRoom(
49-
name = ROOM_NAME,
50-
metadata = METADATA,
60+
name = roomName,
61+
metadata = metadata,
5162
).execute()
5263
val room = response.body()
5364

5465
assertTrue(response.isSuccessful)
55-
assertEquals(ROOM_NAME, room?.name)
56-
assertEquals(METADATA, room?.metadata)
66+
assertEquals(roomName, room?.name)
67+
assertEquals(metadata, room?.metadata)
5768
}
5869

5970
@Test
6071
fun listRooms() {
61-
client.createRoom(ROOM_NAME).execute()
72+
client.createRoom(roomName).execute()
6273
val response = client.listRooms(null).execute()
6374
val rooms = response.body()
6475

6576
assertTrue(response.isSuccessful)
6677
assertNotNull(rooms)
67-
assertTrue(rooms.any { room -> room.name == ROOM_NAME })
78+
assertTrue(rooms.any { room -> room.name == roomName })
6879
}
6980

7081
@Test
7182
fun deleteRoom() {
72-
client.createRoom(ROOM_NAME).execute()
73-
client.deleteRoom(ROOM_NAME).execute()
83+
client.createRoom(roomName).execute()
84+
client.deleteRoom(roomName).execute()
7485
val response = client.listRooms(null).execute()
7586
val rooms = response.body()
7687

7788
assertTrue(response.isSuccessful)
7889
assertNotNull(rooms)
79-
assertTrue(rooms.none { room -> room.name == ROOM_NAME })
90+
assertTrue(rooms.none { room -> room.name == roomName })
8091
}
8192

8293
@Test
8394
fun updateRoomMetadata() {
8495
val metadata = "NewMetadata"
85-
client.createRoom(ROOM_NAME).execute()
86-
val response = client.updateRoomMetadata(ROOM_NAME, metadata).execute()
96+
client.createRoom(roomName).execute()
97+
val response = client.updateRoomMetadata(roomName, metadata).execute()
8798
val room = response.body()
8899

89100
assertTrue(response.isSuccessful)
@@ -93,8 +104,8 @@ class RoomServiceClientTest {
93104

94105
@Test
95106
fun listParticipants() {
96-
client.createRoom(ROOM_NAME).execute()
97-
val response = client.listParticipants(ROOM_NAME).execute()
107+
client.createRoom(roomName).execute()
108+
val response = client.listParticipants(roomName).execute()
98109
val participants = response.body()
99110
assertTrue(response.isSuccessful)
100111
assertNotNull(participants)
@@ -104,12 +115,13 @@ class RoomServiceClientTest {
104115
@Test
105116
@Ignore("Requires manual participant")
106117
fun updateParticipant() {
107-
val participants = client.listParticipants(ROOM_NAME).execute().body()
118+
client.createRoom(roomName).execute()
119+
val participants = client.listParticipants(roomName).execute().body()
108120
if (participants != null) {
109121
val participant = participants.first()
110122

111123
val newMetadata = "new_metadata"
112-
val response = client.updateParticipant(ROOM_NAME, participant.identity, metadata = newMetadata).execute()
124+
val response = client.updateParticipant(roomName, participant.identity, metadata = newMetadata).execute()
113125
val updatedParticipant = response.body()!!
114126
assertTrue(response.isSuccessful)
115127
assertEquals(newMetadata, updatedParticipant.metadata)
@@ -118,13 +130,14 @@ class RoomServiceClientTest {
118130

119131
@Test
120132
fun getParticipant() {
121-
val response = client.getParticipant(ROOM_NAME, "fdsa").execute()
133+
client.createRoom(roomName).execute()
134+
client.getParticipant(roomName, "fdsa").execute()
122135
}
123136

124137
@Test
125138
fun sendData() {
126-
client.createRoom(ROOM_NAME).execute()
127-
val response = client.sendData(ROOM_NAME, "data".toByteArray(), LivekitModels.DataPacket.Kind.RELIABLE).execute()
139+
client.createRoom(roomName).execute()
140+
val response = client.sendData(roomName, "data".toByteArray(), LivekitModels.DataPacket.Kind.RELIABLE).execute()
128141
assertTrue(response.isSuccessful)
129142
}
130143
}

0 commit comments

Comments
 (0)