Skip to content

Commit 1360ce0

Browse files
marcin-cebomarcin-cebo
committed
Internal change - enabled EE for JS target in KMP tests
1 parent afa6287 commit 1360ce0

File tree

7 files changed

+70
-106
lines changed

7 files changed

+70
-106
lines changed

‎pubnub-kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/ChannelMetadataTest.kt‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.pubnub.api.models.consumer.PNStatus
66
import com.pubnub.api.models.consumer.objects.PNPage
77
import com.pubnub.api.models.consumer.objects.channel.PNChannelMetadata
88
import com.pubnub.api.models.consumer.pubsub.objects.PNDeleteChannelMetadataEventMessage
9+
import com.pubnub.api.models.consumer.pubsub.objects.PNObjectEventResult
910
import com.pubnub.api.models.consumer.pubsub.objects.PNSetChannelMetadataEventMessage
1011
import com.pubnub.kmp.PLATFORM
1112
import com.pubnub.kmp.createCustomObject
@@ -16,7 +17,6 @@ import com.pubnub.test.BaseIntegrationTest
1617
import com.pubnub.test.await
1718
import com.pubnub.test.randomString
1819
import com.pubnub.test.test
19-
import kotlinx.coroutines.delay
2020
import kotlinx.coroutines.test.runTest
2121
import kotlin.test.Test
2222
import kotlin.test.assertEquals
@@ -263,14 +263,11 @@ class ChannelMetadataTest : BaseIntegrationTest() {
263263
}
264264

265265
@Test
266-
fun can_receive_set_metadata_event() = runTest(timeout = 30.seconds) {
266+
fun can_receive_set_metadata_event() = runTest {
267267
pubnub.test(backgroundScope) {
268268
// given
269269
pubnub.awaitSubscribe(listOf(channel))
270270

271-
// Wait a bit to ensure subscription is fully established
272-
delay(200)
273-
274271
// when
275272
pubnub.setChannelMetadata(
276273
channel,
@@ -283,8 +280,9 @@ class ChannelMetadataTest : BaseIntegrationTest() {
283280
).await()
284281

285282
// then
286-
val result = waitForEvent(PNSetChannelMetadataEventMessage::class)
287-
val message = result.extractedMessage as PNSetChannelMetadataEventMessage
283+
val result = nextEvent<PNObjectEventResult>()
284+
val message = result.extractedMessage
285+
message as PNSetChannelMetadataEventMessage
288286
assertEquals(channel, message.data.id)
289287
assertEquals(name, message.data.name?.value)
290288
assertEquals(description, message.data.description?.value)
@@ -318,9 +316,8 @@ class ChannelMetadataTest : BaseIntegrationTest() {
318316
}
319317

320318
@Test
321-
fun can_receive_delete_metadata_event() = runTest(timeout = 30.seconds) {
319+
fun can_receive_delete_metadata_event() = runTest {
322320
pubnub.test(backgroundScope) {
323-
// given
324321
pubnub.setChannelMetadata(
325322
channel,
326323
name = name,
@@ -332,15 +329,17 @@ class ChannelMetadataTest : BaseIntegrationTest() {
332329
).await()
333330
pubnub.awaitSubscribe(listOf(channel))
334331

335-
// Wait a bit to ensure subscription is fully established
336-
delay(200)
337-
338332
// when
339333
pubnub.removeChannelMetadata(channel).await()
340334

341335
// then
342-
val result = waitForEvent(PNDeleteChannelMetadataEventMessage::class)
343-
val message = result.extractedMessage as PNDeleteChannelMetadataEventMessage
336+
var result = nextEvent<PNObjectEventResult>()
337+
if (result.extractedMessage !is PNDeleteChannelMetadataEventMessage) {
338+
result = nextEvent()
339+
}
340+
val message = result.extractedMessage
341+
assertTrue { message is PNDeleteChannelMetadataEventMessage }
342+
message as PNDeleteChannelMetadataEventMessage
344343
assertEquals(channel, message.channel)
345344
}
346345
}

‎pubnub-kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/PublishTest.kt‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ import com.pubnub.test.BaseIntegrationTest
1313
import com.pubnub.test.await
1414
import com.pubnub.test.randomString
1515
import com.pubnub.test.test
16-
import kotlinx.coroutines.delay
1716
import kotlinx.coroutines.test.runTest
1817
import kotlin.js.JsExport
1918
import kotlin.test.Ignore
2019
import kotlin.test.Test
2120
import kotlin.test.assertEquals
2221
import kotlin.test.assertTrue
23-
import kotlin.time.Duration.Companion.seconds
2422

2523
@JsExport
2624
data class ABC(
@@ -35,28 +33,32 @@ class PublishTest : BaseIntegrationTest() {
3533
@Test
3634
fun can_publish_message_string() =
3735
runTest {
38-
val result = pubnub.publish(channel = channel, message = "some message", customMessageType = "myCustomType").await()
36+
val result =
37+
pubnub.publish(channel = channel, message = "some message", customMessageType = "myCustomType").await()
3938
assertTrue { result.timetoken > 0 }
4039
}
4140

4241
@Test
4342
fun can_signal() =
4443
runTest {
45-
val result = pubnub.signal(channel = channel, message = "some message", customMessageType = "myCustomType").await()
44+
val result =
45+
pubnub.signal(channel = channel, message = "some message", customMessageType = "myCustomType").await()
4646
assertTrue { result.timetoken > 0 }
4747
}
4848

4949
@Test
5050
fun can_publish_message_map() =
5151
runTest {
52-
val result = pubnub.publish(channel, mapOf("platform" to PLATFORM, "otherKey" to 123, "another" to true)).await()
52+
val result =
53+
pubnub.publish(channel, mapOf("platform" to PLATFORM, "otherKey" to 123, "another" to true)).await()
5354
assertTrue { result.timetoken > 0 }
5455
}
5556

5657
@Test
5758
fun can_signal_map() =
5859
runTest {
59-
val result = pubnub.signal(channel, mapOf("platform" to PLATFORM, "otherKey" to 123, "another" to true)).await()
60+
val result =
61+
pubnub.signal(channel, mapOf("platform" to PLATFORM, "otherKey" to 123, "another" to true)).await()
6062
assertTrue { result.timetoken > 0 }
6163
}
6264

@@ -69,13 +71,10 @@ class PublishTest : BaseIntegrationTest() {
6971
}
7072

7173
@Test
72-
fun can_receive_message_with_map_metadata() = runTest(timeout = 30.seconds) {
74+
fun can_receive_message_with_map_metadata() = runTest {
7375
pubnub.test(backgroundScope) {
7476
pubnub.awaitSubscribe(listOf(channel))
7577

76-
// Wait a bit to ensure subscription is fully established
77-
delay(200)
78-
7978
val mapData = mapOf(
8079
"stringValue" to "bbb",
8180
"mapValue" to mapOf("innerKey" to false),
@@ -98,16 +97,9 @@ class PublishTest : BaseIntegrationTest() {
9897
private fun isJS() = PLATFORM == "JS"
9998

10099
@Test
101-
fun can_receive_message_with_primitive_payload() = runTest(timeout = 30.seconds) {
102-
if (isJS()) {
103-
return@runTest
104-
}
100+
fun can_receive_message_with_primitive_payload() = runTest {
105101
pubnub.test(backgroundScope) {
106102
pubnub.awaitSubscribe(listOf(channel))
107-
108-
// Wait a bit to ensure subscription is fully established
109-
delay(200)
110-
111103
pubnub.publish(
112104
channel,
113105
111,
@@ -125,13 +117,10 @@ class PublishTest : BaseIntegrationTest() {
125117
}
126118

127119
@Test
128-
fun can_receive_message_with_map_payload() = runTest(timeout = 30.seconds) {
120+
fun can_receive_message_with_map_payload() = runTest {
129121
pubnub.test(backgroundScope) {
130122
pubnub.awaitSubscribe(listOf(channel))
131123

132-
// Wait a bit to ensure subscription is fully established
133-
delay(200)
134-
135124
val mapData = mapOf(
136125
"stringValue" to "bbb",
137126
"mapValue" to mapOf("innerKey" to false),
@@ -150,13 +139,10 @@ class PublishTest : BaseIntegrationTest() {
150139
}
151140

152141
@Test
153-
fun can_receive_signal_with_map_payload() = runTest(timeout = 30.seconds) {
142+
fun can_receive_signal_with_map_payload() = runTest {
154143
pubnub.test(backgroundScope) {
155144
pubnub.awaitSubscribe(listOf(channel))
156145

157-
// Wait a bit to ensure subscription is fully established
158-
delay(200)
159-
160146
val mapData = mapOf(
161147
"stringValue" to "bbb",
162148
"mapValue" to mapOf("innerKey" to false)
@@ -171,13 +157,10 @@ class PublishTest : BaseIntegrationTest() {
171157
}
172158

173159
@Test
174-
fun can_receive_message_with_payload_with_floats() = runTest(timeout = 30.seconds) {
160+
fun can_receive_message_with_payload_with_floats() = runTest {
175161
pubnub.test(backgroundScope) {
176162
pubnub.awaitSubscribe(listOf(channel))
177163

178-
// Wait a bit to ensure subscription is fully established
179-
delay(200)
180-
181164
val mapData = mapOf(
182165
"floatValue" to 1.23f,
183166
"doubleValue" to 1.23,
@@ -214,14 +197,10 @@ class PublishTest : BaseIntegrationTest() {
214197
}
215198

216199
@Test
217-
fun publish_with_custom_message_type() = runTest(timeout = 30.seconds) {
200+
fun publish_with_custom_message_type() = runTest {
218201
val customMessageType = randomString()
219202
pubnub.test(backgroundScope) {
220203
pubnub.awaitSubscribe(listOf(channel))
221-
222-
// Wait a bit to ensure subscription is fully established
223-
delay(500)
224-
225204
pubnub.publish(channel, "some message", customMessageType = customMessageType).await()
226205
val result = nextMessage()
227206
assertEquals("some message", result.message.asString())

‎pubnub-kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/UserMetadataTest.kt‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import com.pubnub.api.models.consumer.objects.PNPage
55
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadata
66
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadataArrayResult
77
import com.pubnub.api.models.consumer.pubsub.objects.PNDeleteUUIDMetadataEventMessage
8+
import com.pubnub.api.models.consumer.pubsub.objects.PNObjectEventResult
89
import com.pubnub.api.models.consumer.pubsub.objects.PNSetUUIDMetadataEventMessage
910
import com.pubnub.kmp.createCustomObject
1011
import com.pubnub.test.BaseIntegrationTest
1112
import com.pubnub.test.await
1213
import com.pubnub.test.randomString
1314
import com.pubnub.test.test
14-
import kotlinx.coroutines.delay
1515
import kotlinx.coroutines.test.runTest
1616
import kotlin.test.Test
1717
import kotlin.test.assertEquals
@@ -114,14 +114,11 @@ class UserMetadataTest : BaseIntegrationTest() {
114114
}
115115

116116
@Test
117-
fun can_receive_set_metadata_event() = runTest(timeout = 30.seconds) {
117+
fun can_receive_set_metadata_event() = runTest {
118118
pubnub.test(backgroundScope) {
119119
// given
120120
pubnub.awaitSubscribe(listOf(uuid))
121121

122-
// Wait a bit to ensure subscription is fully established
123-
delay(200)
124-
125122
// when
126123
pubnub.setUUIDMetadata(
127124
uuid,
@@ -135,8 +132,9 @@ class UserMetadataTest : BaseIntegrationTest() {
135132
).await()
136133

137134
// then
138-
val result = waitForEvent(PNSetUUIDMetadataEventMessage::class)
139-
val message = result.extractedMessage as PNSetUUIDMetadataEventMessage
135+
val result = nextEvent<PNObjectEventResult>()
136+
val message = result.extractedMessage
137+
message as PNSetUUIDMetadataEventMessage
140138
assertEquals(uuid, message.data.id)
141139
assertNull(message.data.name?.value)
142140
assertEquals(externalId, message.data.externalId?.value)
@@ -173,7 +171,7 @@ class UserMetadataTest : BaseIntegrationTest() {
173171
}
174172

175173
@Test
176-
fun can_receive_delete_metadata_event() = runTest(timeout = 30.seconds) {
174+
fun can_receive_delete_metadata_event() = runTest {
177175
pubnub.test(backgroundScope) {
178176
// given
179177
pubnub.setUUIDMetadata(
@@ -189,14 +187,11 @@ class UserMetadataTest : BaseIntegrationTest() {
189187
).await()
190188
pubnub.awaitSubscribe(listOf(uuid))
191189

192-
// Wait a bit to ensure subscription is fully established
193-
delay(200)
194-
195190
// when
196191
pubnub.removeUUIDMetadata(uuid).await()
197192

198193
// then
199-
val result = waitForEvent(PNDeleteUUIDMetadataEventMessage::class)
194+
val result = nextEvent<PNObjectEventResult>()
200195
val message = result.extractedMessage as PNDeleteUUIDMetadataEventMessage
201196
assertEquals(uuid, message.uuid)
202197
}

‎pubnub-kotlin/pubnub-kotlin-test/src/appleMain/kotlin/com.pubnub.test/platform.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.pubnub.test
2+
3+
internal actual val PLATFORM: String = "iOS"

0 commit comments

Comments
 (0)