Skip to content

Commit 9bc107e

Browse files
committed
Stop using kluent assertions
1 parent a8e9215 commit 9bc107e

File tree

1 file changed

+26
-22
lines changed
  • stream-chat-android-client/src/test/java/io/getstream/chat/android/client

1 file changed

+26
-22
lines changed

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/ChatClientTest.kt

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ import io.getstream.result.Error
5151
import io.getstream.result.Result
5252
import kotlinx.coroutines.delay
5353
import kotlinx.coroutines.test.runTest
54-
import org.amshove.kluent.shouldBeEqualTo
54+
import org.junit.jupiter.api.Assertions.assertEquals
55+
import org.junit.jupiter.api.Assertions.assertNull
5556
import org.junit.jupiter.api.BeforeEach
5657
import org.junit.jupiter.api.Test
5758
import org.junit.jupiter.api.extension.RegisterExtension
@@ -157,8 +158,8 @@ internal class ChatClientTest {
157158
val channelId = randomString()
158159
val channelClient = client.channel(channelType, channelId)
159160

160-
channelClient.channelType shouldBeEqualTo channelType
161-
channelClient.channelId shouldBeEqualTo channelId
161+
assertEquals(channelType, channelClient.channelType)
162+
assertEquals(channelId, channelClient.channelId)
162163
}
163164

164165
@Test
@@ -167,8 +168,8 @@ internal class ChatClientTest {
167168
val channelClient = client.channel(cid)
168169

169170
val (type, id) = cid.cidToTypeAndId()
170-
channelClient.channelType shouldBeEqualTo type
171-
channelClient.channelId shouldBeEqualTo id
171+
assertEquals(type, channelClient.channelType)
172+
assertEquals(id, channelClient.channelId)
172173
}
173174

174175
@Test
@@ -179,7 +180,7 @@ internal class ChatClientTest {
179180

180181
fakeChatSocket.mockEventReceived(eventB)
181182

182-
result shouldBeEqualTo listOf(eventB)
183+
assertEquals(listOf(eventB), result)
183184
}
184185

185186
@Test
@@ -192,7 +193,7 @@ internal class ChatClientTest {
192193
fakeChatSocket.mockEventReceived(eventB)
193194
fakeChatSocket.mockEventReceived(eventC)
194195

195-
result shouldBeEqualTo listOf(eventA, eventB, eventC)
196+
assertEquals(listOf(eventA, eventB, eventC), result)
196197
}
197198

198199
@Test
@@ -207,7 +208,7 @@ internal class ChatClientTest {
207208
fakeChatSocket.mockEventReceived(eventE)
208209
fakeChatSocket.mockEventReceived(eventD)
209210

210-
result shouldBeEqualTo listOf(eventD, eventF, eventD)
211+
assertEquals(listOf(eventD, eventF, eventD), result)
211212
}
212213

213214
@Test
@@ -220,7 +221,7 @@ internal class ChatClientTest {
220221
fakeChatSocket.mockEventReceived(eventB)
221222
fakeChatSocket.mockEventReceived(eventC)
222223

223-
result shouldBeEqualTo listOf(eventA, eventC)
224+
assertEquals(listOf(eventA, eventC), result)
224225
}
225226

226227
@Test
@@ -233,7 +234,7 @@ internal class ChatClientTest {
233234
fakeChatSocket.mockEventReceived(eventB)
234235
fakeChatSocket.mockEventReceived(eventC)
235236

236-
result shouldBeEqualTo listOf(eventA, eventC)
237+
assertEquals(listOf(eventA, eventC), result)
237238
}
238239

239240
@Test
@@ -246,7 +247,7 @@ internal class ChatClientTest {
246247
fakeChatSocket.mockEventReceived(eventD)
247248
fakeChatSocket.mockEventReceived(eventC)
248249

249-
result shouldBeEqualTo listOf(eventD)
250+
assertEquals(listOf(eventD), result)
250251
}
251252

252253
@Test
@@ -260,7 +261,7 @@ internal class ChatClientTest {
260261
fakeChatSocket.mockEventReceived(eventD)
261262
fakeChatSocket.mockEventReceived(eventE)
262263

263-
result shouldBeEqualTo listOf(eventD)
264+
assertEquals(listOf(eventD), result)
264265
}
265266

266267
@Test
@@ -273,7 +274,7 @@ internal class ChatClientTest {
273274
fakeChatSocket.mockEventReceived(eventD)
274275
fakeChatSocket.mockEventReceived(eventE)
275276

276-
result shouldBeEqualTo listOf(eventD)
277+
assertEquals(listOf(eventD), result)
277278
}
278279

279280
@Test
@@ -289,7 +290,7 @@ internal class ChatClientTest {
289290
fakeChatSocket.mockEventReceived(eventB)
290291
fakeChatSocket.mockEventReceived(eventC)
291292

292-
result shouldBeEqualTo listOf(eventA)
293+
assertEquals(listOf(eventA), result)
293294
}
294295

295296
@Test
@@ -301,7 +302,7 @@ internal class ChatClientTest {
301302

302303
fakeChatSocket.mockEventReceived(Mother.randomUserPresenceChangedEvent(user = updateUser))
303304

304-
client.getCurrentUser() shouldBeEqualTo updateUser
305+
assertEquals(updateUser, client.getCurrentUser())
305306
}
306307

307308
@Test
@@ -335,7 +336,7 @@ internal class ChatClientTest {
335336
fakeChatSocket.verifySocketFactory {
336337
verify(it, times(1)).createSocket(any())
337338
}
338-
client.clientState.connectionState.value shouldBeEqualTo ConnectionState.Offline
339+
assertEquals(ConnectionState.Offline, client.clientState.connectionState.value)
339340
}
340341

341342
@Test
@@ -363,12 +364,15 @@ internal class ChatClientTest {
363364
val result = client.reconnectSocket().await()
364365

365366
/* Then */
366-
result shouldBeEqualTo Result.Failure(
367-
value = Error.GenericError(message = "Invalid user state NotSet without user being set!"),
367+
assertEquals(
368+
Result.Failure(
369+
value = Error.GenericError(message = "Invalid user state NotSet without user being set!"),
370+
),
371+
result,
368372
)
369-
client.getCurrentUser() shouldBeEqualTo null
370-
client.clientState.user.value shouldBeEqualTo null
371-
client.clientState.connectionState.value shouldBeEqualTo ConnectionState.Offline
372-
client.clientState.initializationState.value shouldBeEqualTo InitializationState.NOT_INITIALIZED
373+
assertNull(client.getCurrentUser())
374+
assertNull(client.clientState.user.value)
375+
assertEquals(ConnectionState.Offline, client.clientState.connectionState.value)
376+
assertEquals(InitializationState.NOT_INITIALIZED, client.clientState.initializationState.value)
373377
}
374378
}

0 commit comments

Comments
 (0)