Skip to content

Commit 94c13c9

Browse files
kshitij6325kshitij6325
committed
Fixing tests in CSBackgroundSchedulerTest.kt
1 parent a04e655 commit 94c13c9

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

‎clickstream-health-metrics-api/src/main/kotlin/clickstream/health/intermediate/CSHealthEventProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public interface CSHealthEventProcessor {
5353
* Returns flow of health events with type.
5454
*
5555
* */
56-
public fun getHealthEventFlow(type: String, deleteEvents: Boolean): Flow<List<Health>>
56+
public fun getHealthEventFlow(type: String, deleteEvents: Boolean = false): Flow<List<Health>>
5757

5858

5959
/**

‎clickstream/src/main/kotlin/clickstream/internal/eventscheduler/CSBackgroundScheduler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ internal open class CSBackgroundScheduler(
158158
}
159159

160160
private suspend fun flushHealthEvents() {
161-
healthProcessor?.getHealthEventFlow(CSEventTypesConstant.AGGREGATE, false)?.collect {
161+
healthProcessor?.getHealthEventFlow(CSEventTypesConstant.AGGREGATE)?.collect {
162162
val healthMappedEvent = it.map { health ->
163163
CSEvent(
164164
guid = health.healthMeta.eventGuid,

‎clickstream/src/test/kotlin/clickstream/internal/eventscheduler/CSBackgroundSchedulerTest.kt

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import clickstream.internal.utils.CSNetworkStatusObserver
2222
import clickstream.internal.utils.CSTimeStampGenerator
2323
import clickstream.lifecycle.CSAppLifeCycle
2424
import clickstream.lifecycle.CSBackgroundLifecycleManager
25+
import clickstream.logger.CSLogLevel
2526
import clickstream.logger.CSLogger
2627
import com.gojek.clickstream.internal.Health
2728
import java.util.UUID
@@ -36,6 +37,7 @@ import org.junit.Test
3637
import org.junit.runner.RunWith
3738
import org.mockito.kotlin.any
3839
import org.mockito.kotlin.atLeastOnce
40+
import org.mockito.kotlin.eq
3941
import org.mockito.kotlin.mock
4042
import org.mockito.kotlin.never
4143
import org.mockito.kotlin.times
@@ -44,6 +46,7 @@ import org.mockito.kotlin.verifyNoMoreInteractions
4446
import org.mockito.kotlin.whenever
4547
import org.robolectric.RobolectricTestRunner
4648
import org.robolectric.annotation.Config
49+
import kotlin.math.log
4750

4851
@ExperimentalCoroutinesApi
4952
@RunWith(RobolectricTestRunner::class)
@@ -134,7 +137,7 @@ public class CSBackgroundSchedulerTest {
134137
verify(networkManager, atLeastOnce()).isSocketAvailable()
135138
verify(networkManager, never()).processEvent(any())
136139
verify(networkManager, atLeastOnce()).isSocketAvailable()
137-
verify(logger, atLeastOnce()).debug(any())
140+
verify(logger, atLeastOnce()).debug { "" }
138141
verify(healthEventProcessor, never()).insertBatchEvent(
139142
any(),
140143
any<List<CSEventForHealth>>()
@@ -160,7 +163,7 @@ public class CSBackgroundSchedulerTest {
160163
verify(timeStampGenerator, times(1)).getTimeStamp()
161164
verify(networkManager, times(1)).processEvent(any())
162165
verify(networkManager, atLeastOnce()).isSocketAvailable()
163-
verify(logger, atLeastOnce()).debug(any())
166+
verify(logger, atLeastOnce()).debug { "" }
164167
verify(networkManager, atLeastOnce()).isSocketAvailable()
165168
verify(healthEventProcessor, atLeastOnce()).insertBatchEvent(
166169
any(),
@@ -190,7 +193,7 @@ public class CSBackgroundSchedulerTest {
190193
verify(networkManager, atLeastOnce()).isSocketAvailable()
191194
verify(guIdGenerator).getId()
192195
verify(timeStampGenerator).getTimeStamp()
193-
verify(logger, atLeastOnce()).debug(any())
196+
verify(logger, atLeastOnce()).debug { "" }
194197
verify(healthEventProcessor, atLeastOnce()).insertBatchEvent(
195198
any(),
196199
any<List<CSEventForHealth>>()
@@ -203,7 +206,7 @@ public class CSBackgroundSchedulerTest {
203206
runBlockingTest {
204207
whenever(batteryStatusObserver.getBatteryStatus()).thenReturn(CSBatteryLevel.ADEQUATE_POWER)
205208
whenever(networkStatusObserver.isNetworkAvailable()).thenReturn(true)
206-
whenever(healthEventProcessor.getHealthEventFlow(any(), any())).thenReturn(
209+
whenever(healthEventProcessor.getHealthEventFlow(any(), eq(false))).thenReturn(
207210
flowOf(listOf(Health.getDefaultInstance()))
208211
)
209212
whenever(guIdGenerator.getId()).thenReturn(UUID.randomUUID().toString())
@@ -216,7 +219,7 @@ public class CSBackgroundSchedulerTest {
216219
verify(guIdGenerator, times(1)).getId()
217220
verify(timeStampGenerator, times(1)).getTimeStamp()
218221
verify(networkManager, times(1)).processEvent(any())
219-
verify(logger, atLeastOnce()).debug(any())
222+
verify(logger, atLeastOnce()).debug { "" }
220223
verify(networkManager, atLeastOnce()).isSocketAvailable()
221224
verify(healthEventProcessor, never()).insertBatchEvent(
222225
any(),
@@ -232,7 +235,7 @@ public class CSBackgroundSchedulerTest {
232235

233236
val eventData = CSEventData.create(defaultEventWrapperData())
234237
eventRepository.insertEventData(eventData)
235-
whenever(healthEventProcessor.getHealthEventFlow(any(), any())).thenReturn(
238+
whenever(healthEventProcessor.getHealthEventFlow(any(), eq(false))).thenReturn(
236239
flowOf(listOf(Health.getDefaultInstance()))
237240
)
238241
whenever(guIdGenerator.getId()).thenReturn(UUID.randomUUID().toString())
@@ -245,7 +248,7 @@ public class CSBackgroundSchedulerTest {
245248
verify(guIdGenerator, times(2)).getId()
246249
verify(timeStampGenerator, times(2)).getTimeStamp()
247250
verify(networkManager, times(2)).processEvent(any())
248-
verify(logger, atLeastOnce()).debug(any())
251+
verify(logger, atLeastOnce()).debug { "" }
249252
verify(networkManager, atLeastOnce()).isSocketAvailable()
250253
verify(healthEventProcessor, times(1)).insertBatchEvent(
251254
any(),
@@ -262,7 +265,7 @@ public class CSBackgroundSchedulerTest {
262265
val eventData = CSEventData.create(defaultEventWrapperData())
263266
eventRepository.insertEventData(eventData)
264267
eventRepository.insertEventData(eventData)
265-
whenever(healthEventProcessor.getHealthEventFlow(any(), any())).thenReturn(
268+
whenever(healthEventProcessor.getHealthEventFlow(any(), eq(false))).thenReturn(
266269
flowOf((0..3).map { Health.getDefaultInstance() })
267270
)
268271
whenever(guIdGenerator.getId()).thenReturn(UUID.randomUUID().toString())
@@ -275,7 +278,7 @@ public class CSBackgroundSchedulerTest {
275278
verify(guIdGenerator, times(2)).getId()
276279
verify(timeStampGenerator, times(2)).getTimeStamp()
277280
verify(networkManager, times(2)).processEvent(any())
278-
verify(logger, atLeastOnce()).debug(any())
281+
verify(logger, atLeastOnce()).debug { "" }
279282
verify(networkManager, atLeastOnce()).isSocketAvailable()
280283
verify(healthEventProcessor, times(1)).insertBatchEvent(
281284
any(),
@@ -301,7 +304,7 @@ public class CSBackgroundSchedulerTest {
301304
verify(guIdGenerator, times(1)).getId()
302305
verify(timeStampGenerator, times(1)).getTimeStamp()
303306
verify(networkManager, times(1)).processEvent(any())
304-
verify(logger, atLeastOnce()).debug(any())
307+
verify(logger, atLeastOnce()).debug { "" }
305308
verify(networkManager, atLeastOnce()).isSocketAvailable()
306309
verify(healthEventProcessor, times(1)).insertBatchEvent(
307310
any(),
@@ -328,7 +331,7 @@ public class CSBackgroundSchedulerTest {
328331
verify(guIdGenerator, times(1)).getId()
329332
verify(timeStampGenerator, times(1)).getTimeStamp()
330333
verify(networkManager, times(1)).processEvent(any())
331-
verify(logger, atLeastOnce()).debug(any())
334+
verify(logger, atLeastOnce()).debug { "" }
332335
verify(networkManager, atLeastOnce()).isSocketAvailable()
333336
verify(healthEventProcessor, times(1)).insertBatchEvent(
334337
any(),
@@ -360,7 +363,7 @@ public class CSBackgroundSchedulerTest {
360363
verify(networkManager, times(2)).processEvent(any())
361364
verify(guIdGenerator, times(2)).getId()
362365
verify(timeStampGenerator, times(2)).getTimeStamp()
363-
verify(logger, atLeastOnce()).debug(any())
366+
verify(logger, atLeastOnce()).debug { "" }
364367
verify(healthEventProcessor, atLeastOnce()).insertBatchEvent(
365368
any(),
366369
any<List<CSEventForHealth>>()
@@ -376,7 +379,7 @@ public class CSBackgroundSchedulerTest {
376379

377380
val eventData = CSEventData.create(defaultEventWrapperData())
378381
eventRepository.insertEventData(eventData)
379-
whenever(healthEventProcessor.getHealthEventFlow(any(), any())).thenReturn(
382+
whenever(healthEventProcessor.getHealthEventFlow(any(), eq(false))).thenReturn(
380383
flowOf(emptyList())
381384
)
382385
whenever(guIdGenerator.getId()).thenReturn(UUID.randomUUID().toString())
@@ -389,11 +392,11 @@ public class CSBackgroundSchedulerTest {
389392
verify(guIdGenerator, times(1)).getId()
390393
verify(timeStampGenerator, times(1)).getTimeStamp()
391394
verify(networkManager, times(1)).processEvent(any())
392-
verify(logger, atLeastOnce()).debug(any())
395+
verify(logger, atLeastOnce()).debug { "" }
393396
verify(networkManager, atLeastOnce()).isSocketAvailable()
394397
verify(healthEventProcessor, atLeastOnce()).insertBatchEvent(
395398
any(),
396399
any<List<CSEventForHealth>>()
397400
)
398401
}
399-
}
402+
}

0 commit comments

Comments
 (0)