Merge pull request #3 from segment-integrations/development

development to main

Author: RawatRaveena

lib/src/main/java/com/segment/analytics/kotlin/destinations/adjust/AdjustDestination.kt

@@ -23,9 +23,7 @@ import kotlinx.serialization.json.put
  * @see <a href="https://segment.com/docs/integrations/adjust/">Adjust Integration</a>
  * @see <a href="https://github.com/adjust/android_sdk">Adjust Android SDK</a>
  */
-class AdjustDestination(
-    private var adjustInstance: AdjustInstance = Adjust.getDefaultInstance()
-) : DestinationPlugin(), AndroidLifecycle {
+class AdjustDestination : DestinationPlugin(), AndroidLifecycle {
 
     internal var settings: AdjustSettings? = null
 
@@ -60,16 +58,17 @@ class AdjustDestination(
                             AdjustSegmentAttributionChangedListener(analytics)
                         adjustConfig.setOnAttributionChangedListener(listener)
                     }
-                    adjustInstance.onCreate(adjustConfig)
+                    Adjust.onCreate(adjustConfig)
+                    Adjust.onResume()
                     analytics.log("Adjust Destination loaded")
                 }
             }
         }
     }
 
-    override fun identify(payload: IdentifyEvent): BaseEvent? {
+    override fun identify(payload: IdentifyEvent): BaseEvent {
         setPartnerParams(payload)
-        return super.identify(payload)
+        return payload
     }
 
     override fun track(payload: TrackEvent): BaseEvent? {
@@ -90,41 +89,43 @@ class AdjustDestination(
         if (revenue != 0.0 && currency.isNotEmpty()) {
             event.setRevenue(revenue, currency)
         }
-        analytics.log("Adjust.getDefaultInstance().trackEvent($event);")
-        adjustInstance.trackEvent(event)
+        analytics.log("Adjust.trackEvent($event)")
+        Adjust.trackEvent(event)
         return payload
     }
 
     override fun reset() {
         super.reset()
-        adjustInstance.resetSessionPartnerParameters()
-        analytics.log("Adjust.getDefaultInstance().resetSessionPartnerParameters()")
+        Adjust.resetSessionPartnerParameters()
+        analytics.log("Adjust.resetSessionPartnerParameters()")
     }
 
     /**
      * AndroidActivity Lifecycle Methods
      */
     override fun onActivityResumed(activity: Activity?) {
         super.onActivityResumed(activity)
-        adjustInstance.onResume()
+        Adjust.onResume()
+        analytics.log("Adjust.onResume()")
     }
 
     override fun onActivityPaused(activity: Activity?) {
         super.onActivityPaused(activity)
-        adjustInstance.onPause()
+        Adjust.onPause()
+        analytics.log("Adjust.onPause()")
     }
 
     /**
      * adding session Partner parameters to Adjust. It will merge session partner parameters with event partner parameter.
      */
     private fun setPartnerParams(payload: BaseEvent) {
         if (payload.userId.isNotEmpty()) {
-            adjustInstance.addSessionPartnerParameter("userId", payload.userId)
-            analytics.log("Adjust.getDefaultInstance().addSessionPartnerParameter(userId, ${payload.userId})")
+            Adjust.addSessionPartnerParameter("userId", payload.userId)
+            analytics.log("Adjust.addSessionPartnerParameter(userId, ${payload.userId})")
         }
         if (payload.anonymousId.isNotEmpty()) {
-            adjustInstance.addSessionPartnerParameter("anonymousId", payload.anonymousId)
-            analytics.log("Adjust.getDefaultInstance().addSessionPartnerParameter(anonymousId, ${payload.anonymousId})")
+            Adjust.addSessionPartnerParameter("anonymousId", payload.anonymousId)
+            analytics.log("Adjust.addSessionPartnerParameter(anonymousId, ${payload.anonymousId})")
         }
     }
 

lib/src/test/kotlin/com/segment/analytics/kotlin/destinations/adjust/AdjustDestinationTests.kt

@@ -6,7 +6,6 @@ import android.content.Context
 import android.os.Build
 import com.adjust.sdk.Adjust
 import com.adjust.sdk.AdjustAttribution
-import com.adjust.sdk.AdjustInstance
 import com.segment.analytics.kotlin.core.*
 import com.segment.analytics.kotlin.core.platform.Plugin
 import com.segment.analytics.kotlin.core.utilities.LenientJson
@@ -35,9 +34,6 @@ class AdjustDestinationTests {
     @MockK(relaxUnitFun = true)
     lateinit var mockedAnalytics: Analytics
 
-    @MockK(relaxUnitFun = true)
-    lateinit var mockedAdjustInstance: AdjustInstance
-
     private lateinit var adjustDestination: AdjustDestination
 
     private val sampleAdjustSettings: Settings = LenientJson.decodeFromString(
@@ -65,15 +61,11 @@ class AdjustDestinationTests {
     @Before
     fun setUp() {
         mockkStatic(Adjust::class)
-        every { Adjust.getDefaultInstance() } answers { mockedAdjustInstance }
         adjustDestination = AdjustDestination()
         every { mockedAnalytics.configuration.application } returns mockApplication
         every { mockApplication.applicationContext } returns mockedContext
         mockedAnalytics.configuration.application = mockedContext
-
         adjustDestination.analytics = mockedAnalytics
-
-        mockkStatic(Adjust::class)
     }
 
 
@@ -143,7 +135,7 @@ class AdjustDestinationTests {
         }
         val identifyEvent = adjustDestination.identify(sampleIdentifyEvent)
         assertNotNull(identifyEvent)
-        verify { mockedAdjustInstance.addSessionPartnerParameter("userId", "adjust-UserID-123") }
+        verify { Adjust.addSessionPartnerParameter("userId", "adjust-UserID-123") }
     }
 
     @Test
@@ -166,7 +158,7 @@ class AdjustDestinationTests {
         val identifyEvent = adjustDestination.identify(sampleIdentifyEvent)
         assertNotNull(identifyEvent)
         verify {
-            mockedAdjustInstance.addSessionPartnerParameter(
+            Adjust.addSessionPartnerParameter(
                 "anonymousId",
                 "adjust-anonId-123"
             )
@@ -176,13 +168,12 @@ class AdjustDestinationTests {
     @Test
     fun `reset is handled correctly`() {
         adjustDestination.reset()
-        verify { mockedAdjustInstance.resetSessionPartnerParameters() }
+        verify { Adjust.resetSessionPartnerParameters() }
     }
 
     @Test
     fun `track is handled correctly`() {
         adjustDestination.update(sampleAdjustSettings, Plugin.UpdateType.Initial)
-
         val sampleTrackEvent = TrackEvent(
             event = "foo",
             properties = buildJsonObject {
@@ -198,7 +189,7 @@ class AdjustDestinationTests {
         }
         val trackEvent = adjustDestination.track(sampleTrackEvent)
         assertNotNull(trackEvent)
-//        verify { mockedAdjustInstance.trackEvent(AdjustEvent("foo")) }
+        verify { Adjust.trackEvent(any()) }
     }
 
     @Test
@@ -231,12 +222,12 @@ class AdjustDestinationTests {
     @Test
     fun `onActivityResumed() handled correctly`() {
         adjustDestination.onActivityResumed(mockkClass(Activity::class))
-        verify { mockedAdjustInstance.onResume() }
+        verify { Adjust.onResume() }
     }
 
     @Test
     fun `onActivityPaused() handled correctly`() {
         adjustDestination.onActivityPaused(mockkClass(Activity::class))
-        verify { mockedAdjustInstance.onPause() }
+        verify { Adjust.onPause() }
     }
 }