Merge branch 'issue/migrate_events_builder_to_kotlin' into issue/parsely_tracker_kotlin_migration

Author: wzieba

parsely/src/main/java/com/parsely/parselyandroid/EventsBuilder.kt

@@ -6,7 +6,8 @@ import java.util.TimeZone
 
 internal class EventsBuilder(
     private val deviceInfoRepository: DeviceInfoRepository,
-    private val siteId: String
+    private val siteId: String,
+    private val clock: Clock,
 ) {
     /**
      * Create an event Map
@@ -26,7 +27,6 @@ internal class EventsBuilder(
         uuid: String
     ): Map<String, Any> {
         log("buildEvent called for %s/%s", action, url)
-        val now = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
 
         // Main event info
         val event: MutableMap<String, Any> = HashMap()
@@ -41,7 +41,7 @@ internal class EventsBuilder(
             data.putAll(extraData)
         }
         val deviceInfo = deviceInfoRepository.collectDeviceInfo()
-        data["ts"] = now.timeInMillis
+        data["ts"] = clock.now.inWholeMilliseconds
         data.putAll(deviceInfo)
         event["data"] = data
         metadata?.let {

parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.kt

@@ -47,11 +47,12 @@ public open class ParselyTracker protected constructor(siteId: String, flushInte
      */
     init {
         val context = c.applicationContext
+        clock = Clock()
         eventsBuilder = EventsBuilder(
             AndroidDeviceInfoRepository(
                 AdvertisementIdProvider(context, sdkScope),
                 AndroidIdProvider(context)
-            ), siteId
+            ), siteId, clock
         )
         val localStorageRepository = LocalStorageRepository(context)
         flushManager = ParselyFlushManager(
@@ -73,7 +74,6 @@ public open class ParselyTracker protected constructor(siteId: String, flushInte
             sdkScope,
             AndroidConnectivityStatusProvider(context)
         )
-        clock = Clock()
         intervalCalculator = HeartbeatIntervalCalculator(clock)
 
         isDebug = false

parsely/src/test/java/com/parsely/parselyandroid/EventsBuilderTest.kt

@@ -1,18 +1,22 @@
 package com.parsely.parselyandroid
 
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.hours
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.MapAssert
 import org.junit.Before
 import org.junit.Test
 
 internal class EventsBuilderTest {
     private lateinit var sut: EventsBuilder
+    private val clock = FakeClock()
 
     @Before
     fun setUp() {
         sut = EventsBuilder(
             FakeDeviceInfoRepository(),
             TEST_SITE_ID,
+            clock
         )
     }
 
@@ -187,20 +191,22 @@ internal class EventsBuilderTest {
                 assertThat(it)
                     .hasSize(2)
                     .containsAllEntriesOf(FAKE_DEVICE_INFO)
-                    .hasEntrySatisfying("ts") { timestamp ->
-                        assertThat(timestamp as Long).isBetween(1111111111111, 9999999999999)
-                    }
             }
 
     companion object {
         const val TEST_SITE_ID = "Example"
         const val TEST_URL = "http://example.com/some-old/article.html"
         const val TEST_UUID = "123e4567-e89b-12d3-a456-426614174000"
 
-        val FAKE_DEVICE_INFO = mapOf("device" to "info")
+        val FAKE_NOW = 15.hours
+        val FAKE_DEVICE_INFO = mapOf("device" to "info", "ts" to FAKE_NOW.inWholeMilliseconds.toString())
     }
 
     class FakeDeviceInfoRepository: DeviceInfoRepository {
         override fun collectDeviceInfo(): Map<String, String> = FAKE_DEVICE_INFO
     }
+
+    class FakeClock() : Clock() {
+        override val now: Duration = FAKE_NOW
+    }
 }