From f04e95003b1438752af97d5fb47dfb4745479b5e Mon Sep 17 00:00:00 2001
From: Sarah Koop <skoop@paypal.com>
Date: Mon, 16 Dec 2024 10:59:57 -0600
Subject: [PATCH] Fix lint and add unit tests

---
 .../api/paypal/PayPalClientUnitTest.java      |  5 +++-
 .../ShopperInsightsClientUnitTest.kt          | 26 +++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java
index e5644548d7..a77ae202ab 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java
@@ -33,6 +33,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.skyscreamer.jsonassert.JSONAssert;
 
+import java.util.Collections;
+
 @RunWith(RobolectricTestRunner.class)
 public class PayPalClientUnitTest {
 
@@ -62,6 +64,7 @@ public void beforeEach() throws JSONException {
     public void createPaymentAuthRequest_callsBackPayPalResponse_sendsStartedAnalytics() throws JSONException {
         PayPalVaultRequest payPalVaultRequest = new PayPalVaultRequest(true);
         payPalVaultRequest.setMerchantAccountId("sample-merchant-account-id");
+        payPalVaultRequest.setShopperSessionId("test-shopper-session-id");
 
         PayPalPaymentAuthRequestParams paymentAuthRequest = new PayPalPaymentAuthRequestParams(
             payPalVaultRequest,
@@ -106,7 +109,7 @@ public void createPaymentAuthRequest_callsBackPayPalResponse_sendsStartedAnalyti
 
         verify(braintreeClient).sendAnalyticsEvent(
             PayPalAnalytics.TOKENIZATION_STARTED,
-            new AnalyticsEventParams(null, null, true, null, null, null)
+            new AnalyticsEventParams(null, null, true, null, null, null, null, Collections.emptyList(), null, "test-shopper-session-id")
         );
     }
 
diff --git a/ShopperInsights/src/test/java/com/braintreepayments/api/shopperinsights/ShopperInsightsClientUnitTest.kt b/ShopperInsights/src/test/java/com/braintreepayments/api/shopperinsights/ShopperInsightsClientUnitTest.kt
index 14933b70ca..3186d6dd42 100644
--- a/ShopperInsights/src/test/java/com/braintreepayments/api/shopperinsights/ShopperInsightsClientUnitTest.kt
+++ b/ShopperInsights/src/test/java/com/braintreepayments/api/shopperinsights/ShopperInsightsClientUnitTest.kt
@@ -44,6 +44,7 @@ class ShopperInsightsClientUnitTest {
     private lateinit var merchantRepository: MerchantRepository
     private lateinit var context: Context
     private lateinit var deviceInspector: DeviceInspector
+    private var shopperSessionId = "test-shopper-session-id"
 
     private val clientToken = mockk<ClientToken>()
 
@@ -62,7 +63,8 @@ class ShopperInsightsClientUnitTest {
             analyticsParamRepository,
             api,
             merchantRepository,
-            deviceInspector
+            deviceInspector,
+            shopperSessionId = shopperSessionId
         )
         context = ApplicationProvider.getApplicationContext()
     }
@@ -79,7 +81,9 @@ class ShopperInsightsClientUnitTest {
         val experiment = "some_experiment"
         sut.getRecommendedPaymentMethods(mockk(relaxed = true), experiment, mockk(relaxed = true))
 
-        verifyStartedAnalyticsEvent(AnalyticsEventParams(experiment = experiment))
+        verifyStartedAnalyticsEvent(AnalyticsEventParams(
+            experiment = experiment,
+            shopperSessionId = shopperSessionId))
     }
 
     @Test
@@ -435,25 +439,29 @@ class ShopperInsightsClientUnitTest {
     @Test
     fun `test paypal presented analytics event`() {
         sut.sendPayPalPresentedEvent()
-        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:paypal-presented") }
+        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:paypal-presented",
+            AnalyticsEventParams(shopperSessionId = shopperSessionId)) }
     }
 
     @Test
     fun `test paypal selected analytics event`() {
         sut.sendPayPalSelectedEvent()
-        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:paypal-selected") }
+        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:paypal-selected",
+            AnalyticsEventParams(shopperSessionId = shopperSessionId)) }
     }
 
     @Test
     fun `test venmo presented analytics event`() {
         sut.sendVenmoPresentedEvent()
-        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:venmo-presented") }
+        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:venmo-presented",
+            AnalyticsEventParams(shopperSessionId = shopperSessionId)) }
     }
 
     @Test
     fun `test venmo selected analytics event`() {
         sut.sendVenmoSelectedEvent()
-        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:venmo-selected") }
+        verify { braintreeClient.sendAnalyticsEvent("shopper-insights:venmo-selected",
+            AnalyticsEventParams(shopperSessionId = shopperSessionId)) }
     }
 
     @Test
@@ -504,14 +512,16 @@ class ShopperInsightsClientUnitTest {
     private fun verifySuccessAnalyticsEvent() {
         verify {
             braintreeClient
-                .sendAnalyticsEvent("shopper-insights:get-recommended-payments:succeeded")
+                .sendAnalyticsEvent("shopper-insights:get-recommended-payments:succeeded",
+                    AnalyticsEventParams(shopperSessionId = shopperSessionId))
         }
     }
 
     private fun verifyFailedAnalyticsEvent() {
         verify {
             braintreeClient
-                .sendAnalyticsEvent("shopper-insights:get-recommended-payments:failed")
+                .sendAnalyticsEvent("shopper-insights:get-recommended-payments:failed",
+                    AnalyticsEventParams(shopperSessionId = shopperSessionId))
         }
     }
 }