From bb9a22887347014aa6fc2dcd60ba831f5c75bde6 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 09:51:50 -0600 Subject: [PATCH 01/21] Create Amex analytics enum --- .../api/AmericanExpressAnalytics.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java new file mode 100644 index 0000000000..11e31021fc --- /dev/null +++ b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java @@ -0,0 +1,20 @@ +package com.braintreepayments.api; + +enum AmericanExpressAnalytics { + + REWARDS_BALANCE_STARTED("amex:rewards-balance:started"), + REWARDS_BALANCE_FAILED("amex:rewards-balance:failed"), + REWARDS_BALANCE_SUCCEEDED("amex:rewards-balance:succeeded"); + + private final String event; + + AmericanExpressAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} + + From 5f21237f48b1626d926447e64dd94cc506a2be33 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 09:56:34 -0600 Subject: [PATCH 02/21] Add google pay analytics --- .../api/GooglePayAnalytics.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java new file mode 100644 index 0000000000..536d0cedef --- /dev/null +++ b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java @@ -0,0 +1,23 @@ +package com.braintreepayments.api; + +enum GooglePayAnalytics { + + PAYMENT_REQUEST_STARTED("google-pay:payment-request:started"), + PAYMENT_REQUEST_FAILED("google-pay:payment-request:failed"), + PAYMENT_REQUEST_SUCCEEDED("google-pay:payment-request:succeeded"), + + TOKENIZE_STARTED("google-pay:tokenize:started"), + TOKENIZE_FAILED("google-pay:tokenize:failed"), + TOKENIZE_NETWORK_CONNECTION_LOST("google-pay:tokenize:network-connection:failed"), + TOKENIZE_SUCCEEDED("google-pay:tokenize:succeeded"); + + private final String event; + + GooglePayAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} From 0b7f9b8f979cfcc63a29da76abe374342eef13ad Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 10:10:41 -0600 Subject: [PATCH 03/21] Add card analytics --- .../braintreepayments/api/CardAnalytics.java | 19 +++++++++++++++++++ .../api/PayPalAnalytics.java | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 Card/src/main/java/com/braintreepayments/api/CardAnalytics.java create mode 100644 PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java diff --git a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java new file mode 100644 index 0000000000..e232a1478a --- /dev/null +++ b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java @@ -0,0 +1,19 @@ +package com.braintreepayments.api; + +enum CardAnalytics { + + CARD_TOKENIZE_STARTED("card:tokenize:started"), + CARD_TOKENIZE_FAILED("card:tokenize:failed"), + CARD_TOKENIZE_SUCCEEDED("card:tokenize:succeeded"), + CARD_TOKENIZE_NETWORK_CONNECTION_LOST("card:tokenize:network-connection:failed"); + + private final String event; + + CardAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java new file mode 100644 index 0000000000..ec783faf28 --- /dev/null +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java @@ -0,0 +1,4 @@ +package com.braintreepayments.api; + +enum PayPalAnalytics { +} From b6a3be57ff2ada9993e7bebc095a7fe83137e6a8 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 10:13:57 -0600 Subject: [PATCH 04/21] Add PayPal analytics enum --- .../api/PayPalAnalytics.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java index ec783faf28..643e83a6f1 100644 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java @@ -1,4 +1,25 @@ package com.braintreepayments.api; enum PayPalAnalytics { + + TOKENIZATION_STARTED("paypal:tokenize:started"), + TOKENIZATION_FAILED("paypal:tokenize:failed"), + TOKENIZATION_SUCCEEDED("paypal:tokenize:succeeded"), + TOKENIZATION_NETWORK_CONNECTION_FAILED("paypal:tokenize:network-connection:failed"), + + BROWSER_PRESENTATION_SUCCEEDED("paypal:tokenize:browser-presentation:succeeded"), + BROWSER_PRESENTATION_FAILED("paypal:tokenize:browser-presentation:failed"), + + BROWSER_LOGIN_CANCELED("paypal:tokenize:browser-login:canceled"); + + private final String event; + + PayPalAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } } + From f11b6b06146d1acc4f9c6c9f67dfb4ea0cda780c Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 10:23:02 -0600 Subject: [PATCH 05/21] Add PayPal native checkout analytics --- .../api/AmericanExpressAnalytics.java | 1 + .../braintreepayments/api/CardAnalytics.java | 1 + .../api/GooglePayAnalytics.java | 2 ++ .../api/PayPalAnalytics.java | 3 +++ .../api/PayPalNativeCheckoutAnalytics.java | 23 +++++++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java index 11e31021fc..f60ad7c778 100644 --- a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java +++ b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java @@ -2,6 +2,7 @@ enum AmericanExpressAnalytics { + // Get Rewards Balance Events REWARDS_BALANCE_STARTED("amex:rewards-balance:started"), REWARDS_BALANCE_FAILED("amex:rewards-balance:failed"), REWARDS_BALANCE_SUCCEEDED("amex:rewards-balance:succeeded"); diff --git a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java index e232a1478a..7353b95cd4 100644 --- a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java +++ b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java @@ -2,6 +2,7 @@ enum CardAnalytics { + // Tokenize Events CARD_TOKENIZE_STARTED("card:tokenize:started"), CARD_TOKENIZE_FAILED("card:tokenize:failed"), CARD_TOKENIZE_SUCCEEDED("card:tokenize:succeeded"), diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java index 536d0cedef..78f3d46a97 100644 --- a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java +++ b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java @@ -2,10 +2,12 @@ enum GooglePayAnalytics { + // Payment Data Request Events PAYMENT_REQUEST_STARTED("google-pay:payment-request:started"), PAYMENT_REQUEST_FAILED("google-pay:payment-request:failed"), PAYMENT_REQUEST_SUCCEEDED("google-pay:payment-request:succeeded"), + // Tokenize Events TOKENIZE_STARTED("google-pay:tokenize:started"), TOKENIZE_FAILED("google-pay:tokenize:failed"), TOKENIZE_NETWORK_CONNECTION_LOST("google-pay:tokenize:network-connection:failed"), diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java index 643e83a6f1..e96d52945c 100644 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java @@ -2,14 +2,17 @@ enum PayPalAnalytics { + // Tokenize Events TOKENIZATION_STARTED("paypal:tokenize:started"), TOKENIZATION_FAILED("paypal:tokenize:failed"), TOKENIZATION_SUCCEEDED("paypal:tokenize:succeeded"), TOKENIZATION_NETWORK_CONNECTION_FAILED("paypal:tokenize:network-connection:failed"), + // Browser Presentation Events BROWSER_PRESENTATION_SUCCEEDED("paypal:tokenize:browser-presentation:succeeded"), BROWSER_PRESENTATION_FAILED("paypal:tokenize:browser-presentation:failed"), + // Browser Login Events BROWSER_LOGIN_CANCELED("paypal:tokenize:browser-login:canceled"); private final String event; diff --git a/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java b/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java new file mode 100644 index 0000000000..c72ce95636 --- /dev/null +++ b/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java @@ -0,0 +1,23 @@ +package com.braintreepayments.api; + +enum PayPalNativeCheckoutAnalytics { + + // Conversion Events + TOKENIZATION_STARTED( "paypal-native:tokenize:started"), + TOKENIZATION_FAILED("paypal-native:tokenize:failed"), + TOKENIZATION_SUCCEEDED("paypal-native:tokenize:succeeded"), + TOKENIZATION_CANCELED("paypal-native:tokenize:canceled"), + + // Additional Detail Events + ORDER_CREATION_FAILED("paypal-native:tokenize:order-creation:failed"); + + private final String event; + + PayPalNativeCheckoutAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} From f56052f64ce29e28e2a5bed2f303c12f08d05c4e Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 10:35:00 -0600 Subject: [PATCH 06/21] Add Local Payment analytics enum --- .../api/LocalPaymentAnalytics.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java diff --git a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java new file mode 100644 index 0000000000..1073db8c38 --- /dev/null +++ b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java @@ -0,0 +1,30 @@ +package com.braintreepayments.api; + +enum LocalPaymentAnalytics { + + // Conversion Events + PAYMENT_STARTED("local-payment:start-payment:started"), + PAYMENT_SUCCEEDED("local-payment:start-payment:succeeded"), + PAYMENT_FAILED("local-payment:start-payment:failed"), + PAYMENT_CANCELED("local-payment:start-payment:browser-login:canceled"), + + // Browser Presentation Events + BROWSER_PRESENTATION_SUCCEEDED("local-payment:start-payment:browser-presentation:succeeded"), + BROWSER_PRESENTATION_FAILED("local-payment:start-payment:browser-presentation:failed"), + + // Browser Login Events + BROWSER_LOGIN_FAILED("local-payment:start-payment:browser-login:failed"), + + // Network Connection Event + PAYMENT_NETWORK_CONNECTION_LOST("local-payment:start-payment:network-connection:failed"); + + private final String event; + + LocalPaymentAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} From ecdabc151ba17872880e14493ca7213962f96ae8 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 11:01:14 -0600 Subject: [PATCH 07/21] Add SEPA analytics events --- .../api/SEPADirectDebitAnalytics.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java diff --git a/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java b/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java new file mode 100644 index 0000000000..f955487d9c --- /dev/null +++ b/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java @@ -0,0 +1,30 @@ +package com.braintreepayments.api; + +enum SEPADirectDebitAnalytics { + + // Conversion Events + TOKENIZE_STARTED("sepa:tokenize:started"), + TOKENIZE_SUCCEEDED("sepa:tokenize:succeeded"), + TOKENIZE_FAILED("sepa:tokenize:failed"), + CHALLENGE_CANCELED("sepa:tokenize:challenge:canceled"), + + // Additional Detail Events + CREATE_MANDATE_CHALLENGE_REQUIRED("sepa:tokenize:create-mandate:challenge-required"), + CREATE_MANDATE_SUCCEEDED("sepa:tokenize:create-mandate:succeeded"), + CREATE_MANDATE_FAILED("sepa:tokenize:create-mandate:failed"), + CHALLENGE_PRESENTATION_SUCCEEDED("sepa:tokenize:challenge-presentation:succeeded"), + CHALLENGE_PRESENTATION_FAILED("sepa:tokenize:challenge-presentation:failed"), + CHALLENGE_ALERT_CANCELED("sepa:tokenize:challenge:alert-canceled"), + CHALLENGE_SUCCEEDED("sepa:tokenize:challenge:succeeded"), + CHALLENGE_FAILED("sepa:tokenize:challenge:failed"); + + private final String event; + + SEPADirectDebitAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} From d9e0c0355dd2866aa9e348ecbbc62f1441bc8d4f Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 11:11:56 -0600 Subject: [PATCH 08/21] Add 3ds analytics --- .../api/ThreeDSecureAnalytics.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java diff --git a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java new file mode 100644 index 0000000000..b92b67ea34 --- /dev/null +++ b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java @@ -0,0 +1,39 @@ +package com.braintreepayments.api; + +enum ThreeDSecureAnalytics { + + // Conversion Events + VERIFY_STARTED("3ds:verify:started"), + VERIFY_SUCCEEDED("3ds:verify:succeeded"), + VERIFY_FAILED("3ds:verify:failed"), + + // cardinal sdk returns a cancellation result + VERIFY_CANCELED("3ds:verify:canceled"), + + // Lookup Events + LOOKUP_SUCCEEDED("3ds:verify:lookup:succeeded"), + LOOKUP_FAILED("3ds:verify:lookup:failed"), + CHALLENGE_REQUIRED("3ds:verify:lookup:challenge-required"), + + // Network Connection Lost + NETWORK_CONNECTION_LOST("3ds:verify:lookup:network-connection:failed"), + + // Challenge Events + CHALLENGE_SUCCEEDED("3ds:verify:challenge.succeeded"), + CHALLENGE_FAILED("3ds:verify:challenge.failed"), + + // JWT Events + JWT_AUTH_SUCCEEDED("3ds:verify:authenticate-jwt:succeeded"), + JWT_AUTH_FAILED("3ds:verify:authenticate-jwt:failed"); + + private final String event; + + ThreeDSecureAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} + From 37f54adde038aed6b7e2d156394af549b0dd94be Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 11:16:15 -0600 Subject: [PATCH 09/21] Add Venmo analytics events --- .../braintreepayments/api/VenmoAnalytics.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java diff --git a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java new file mode 100644 index 0000000000..1a9b4e43ec --- /dev/null +++ b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java @@ -0,0 +1,25 @@ +package com.braintreepayments.api; + +enum VenmoAnalytics { + + // Conversion Events + TOKENIZE_STARTED("venmo:tokenize:started"), + TOKENIZE_FAILED("venmo:tokenize:failed"), + TOKENIZE_SUCCEEDED("venmo:tokenize:succeeded"), + APP_SWITCH_CANCELED("venmo:tokenize:app-switch:canceled"), + + // Additional Detail Events + TOKENIZE_NETWORK_CONNECTION_LOST("venmo:tokenize:network-connection:failed"), + APP_SWITCH_SUCCEEDED("venmo:tokenize:app-switch:succeeded"), + APP_SWITCH_FAILED("venmo:tokenize:app-switch:failed"); + + private final String event; + + VenmoAnalytics(String event) { + this.event = event; + } + + String getEvent() { + return event; + } +} From c85d3355fc6048d0501d3de585710946148e1f8d Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 11:27:34 -0600 Subject: [PATCH 10/21] Add venmo analytics event test --- .../api/VenmoAnalyticsUnitTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java new file mode 100644 index 0000000000..0186965165 --- /dev/null +++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java @@ -0,0 +1,27 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +public class VenmoAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("venmo:tokenize:app-switch:canceled", + VenmoAnalytics.APP_SWITCH_CANCELED.getEvent()); + assertEquals("venmo:tokenize:app-switch:failed", + VenmoAnalytics.APP_SWITCH_FAILED.getEvent()); + assertEquals("venmo:tokenize:app-switch:succeeded", + VenmoAnalytics.APP_SWITCH_SUCCEEDED.getEvent()); + assertEquals("venmo:tokenize:failed", VenmoAnalytics.TOKENIZE_FAILED.getEvent()); + assertEquals("venmo:tokenize:started", VenmoAnalytics.TOKENIZE_STARTED.getEvent()); + assertEquals("venmo:tokenize:succeeded", VenmoAnalytics.TOKENIZE_SUCCEEDED.getEvent()); + assertEquals("venmo:tokenize:network-connection:failed", + VenmoAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.getEvent()); + } + +} From f871c7a1edd216a1f21593dab6f89b42cdd0c69f Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 11:39:04 -0600 Subject: [PATCH 11/21] Add 3ds analytics test --- .../api/ThreeDSecureAnalyticsUnitTest.java | 31 +++++++++++++++++++ .../api/VenmoAnalyticsUnitTest.java | 3 -- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java new file mode 100644 index 0000000000..34562e0b3a --- /dev/null +++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java @@ -0,0 +1,31 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class ThreeDSecureAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("3ds:verify:started", ThreeDSecureAnalytics.VERIFY_STARTED.getEvent()); + assertEquals("3ds:verify:succeeded", ThreeDSecureAnalytics.VERIFY_SUCCEEDED.getEvent()); + assertEquals("3ds:verify:failed", ThreeDSecureAnalytics.VERIFY_FAILED.getEvent()); + assertEquals("3ds:verify:canceled", ThreeDSecureAnalytics.VERIFY_CANCELED.getEvent()); + assertEquals("3ds:verify:lookup:succeeded", + ThreeDSecureAnalytics.LOOKUP_SUCCEEDED.getEvent()); + assertEquals("3ds:verify:lookup:failed", ThreeDSecureAnalytics.LOOKUP_FAILED.getEvent()); + assertEquals("3ds:verify:lookup:challenge-required", + ThreeDSecureAnalytics.CHALLENGE_REQUIRED.getEvent()); + assertEquals("3ds:verify:lookup:network-connection:failed", + ThreeDSecureAnalytics.NETWORK_CONNECTION_LOST.getEvent()); + assertEquals("3ds:verify:challenge.succeeded", + ThreeDSecureAnalytics.CHALLENGE_SUCCEEDED.getEvent()); + assertEquals("3ds:verify:challenge.failed", + ThreeDSecureAnalytics.CHALLENGE_FAILED.getEvent()); + assertEquals("3ds:verify:authenticate-jwt:succeeded", + ThreeDSecureAnalytics.JWT_AUTH_SUCCEEDED.getEvent()); + assertEquals("3ds:verify:authenticate-jwt:failed", + ThreeDSecureAnalytics.JWT_AUTH_FAILED.getEvent()); + } +} diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java index 0186965165..a1f29535bd 100644 --- a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java +++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java @@ -3,10 +3,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) public class VenmoAnalyticsUnitTest { @Test From e8e01ba09ca3dda7ff7108671987d830cf102ad2 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 13:56:27 -0600 Subject: [PATCH 12/21] Add additional unit tests --- .../api/LocalPaymentAnalyticsUnitTest.java | 28 +++++++++++++++ .../api/PayPalAnalyticsUnitTest.java | 24 +++++++++++++ ...PayPalNativeCheckoutAnalyticsUnitTest.java | 22 ++++++++++++ .../api/SEPADirectDebitAnalyticsUnitTest.java | 34 +++++++++++++++++++ 4 files changed, 108 insertions(+) create mode 100644 LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java create mode 100644 PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java create mode 100644 PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java create mode 100644 SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java new file mode 100644 index 0000000000..72ebc1d8db --- /dev/null +++ b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java @@ -0,0 +1,28 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class LocalPaymentAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("local-payment:start-payment:started", + LocalPaymentAnalytics.PAYMENT_STARTED.getEvent()); + assertEquals("local-payment:start-payment:succeeded", + LocalPaymentAnalytics.PAYMENT_SUCCEEDED.getEvent()); + assertEquals("local-payment:start-payment:failed", + LocalPaymentAnalytics.PAYMENT_FAILED.getEvent()); + assertEquals("local-payment:start-payment:browser-login:canceled", + LocalPaymentAnalytics.PAYMENT_CANCELED.getEvent()); + assertEquals("local-payment:start-payment:browser-presentation:succeeded", + LocalPaymentAnalytics.BROWSER_PRESENTATION_SUCCEEDED.getEvent()); + assertEquals("local-payment:start-payment:browser-presentation:failed", + LocalPaymentAnalytics.BROWSER_PRESENTATION_FAILED.getEvent()); + assertEquals("local-payment:start-payment:browser-login:failed", + LocalPaymentAnalytics.BROWSER_LOGIN_FAILED.getEvent()); + assertEquals("local-payment:start-payment:network-connection:failed", + LocalPaymentAnalytics.PAYMENT_NETWORK_CONNECTION_LOST.getEvent()); + } +} diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java new file mode 100644 index 0000000000..2162b532cf --- /dev/null +++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java @@ -0,0 +1,24 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class PayPalAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("paypal:tokenize:started", PayPalAnalytics.TOKENIZATION_STARTED.getEvent()); + assertEquals("paypal:tokenize:failed", PayPalAnalytics.TOKENIZATION_FAILED.getEvent()); + assertEquals("paypal:tokenize:succeeded", + PayPalAnalytics.TOKENIZATION_SUCCEEDED.getEvent()); + assertEquals("paypal:tokenize:network-connection:failed", + PayPalAnalytics.TOKENIZATION_NETWORK_CONNECTION_FAILED.getEvent()); + assertEquals("paypal:tokenize:browser-presentation:succeeded", + PayPalAnalytics.BROWSER_PRESENTATION_SUCCEEDED.getEvent()); + assertEquals("paypal:tokenize:browser-presentation:failed", + PayPalAnalytics.BROWSER_PRESENTATION_FAILED.getEvent()); + assertEquals("paypal:tokenize:browser-login:canceled", + PayPalAnalytics.BROWSER_LOGIN_CANCELED.getEvent()); + } +} diff --git a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java new file mode 100644 index 0000000000..f693f39b50 --- /dev/null +++ b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java @@ -0,0 +1,22 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class PayPalNativeCheckoutAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("paypal-native:tokenize:started", + PayPalNativeCheckoutAnalytics.TOKENIZATION_STARTED.getEvent()); + assertEquals("paypal-native:tokenize:failed", + PayPalNativeCheckoutAnalytics.TOKENIZATION_FAILED.getEvent()); + assertEquals("paypal-native:tokenize:succeeded", + PayPalNativeCheckoutAnalytics.TOKENIZATION_SUCCEEDED.getEvent()); + assertEquals("paypal-native:tokenize:canceled", + PayPalNativeCheckoutAnalytics.TOKENIZATION_CANCELED.getEvent()); + assertEquals("paypal-native:tokenize:order-creation:failed", + PayPalNativeCheckoutAnalytics.ORDER_CREATION_FAILED.getEvent()); + } +} diff --git a/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java new file mode 100644 index 0000000000..2b55a42fd5 --- /dev/null +++ b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java @@ -0,0 +1,34 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class SEPADirectDebitAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("sepa:tokenize:started", SEPADirectDebitAnalytics.TOKENIZE_STARTED.getEvent()); + assertEquals("sepa:tokenize:succeeded", + SEPADirectDebitAnalytics.TOKENIZE_SUCCEEDED.getEvent()); + assertEquals("sepa:tokenize:failed", SEPADirectDebitAnalytics.TOKENIZE_FAILED.getEvent()); + assertEquals("sepa:tokenize:challenge:canceled", + SEPADirectDebitAnalytics.CHALLENGE_CANCELED.getEvent()); + assertEquals("sepa:tokenize:create-mandate:challenge-required", + SEPADirectDebitAnalytics.CREATE_MANDATE_CHALLENGE_REQUIRED.getEvent()); + assertEquals("sepa:tokenize:create-mandate:succeeded", + SEPADirectDebitAnalytics.CREATE_MANDATE_SUCCEEDED.getEvent()); + assertEquals("sepa:tokenize:create-mandate:failed", + SEPADirectDebitAnalytics.CREATE_MANDATE_FAILED.getEvent()); + assertEquals("sepa:tokenize:challenge-presentation:succeeded", + SEPADirectDebitAnalytics.CHALLENGE_PRESENTATION_SUCCEEDED.getEvent()); + assertEquals("sepa:tokenize:challenge-presentation:failed", + SEPADirectDebitAnalytics.CHALLENGE_PRESENTATION_FAILED.getEvent()); + assertEquals("sepa:tokenize:challenge:alert-canceled", + SEPADirectDebitAnalytics.CHALLENGE_ALERT_CANCELED.getEvent()); + assertEquals("sepa:tokenize:challenge:succeeded", + SEPADirectDebitAnalytics.CHALLENGE_SUCCEEDED.getEvent()); + assertEquals("sepa:tokenize:challenge:failed", + SEPADirectDebitAnalytics.CHALLENGE_FAILED.getEvent()); + } +} From 71594a6b7d8178a517d2f430c9466a5d147adf4a Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 13:59:58 -0600 Subject: [PATCH 13/21] Add Google Pay analytics unit test --- .../api/GooglePayAnalyticsUnitTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java new file mode 100644 index 0000000000..228df53b05 --- /dev/null +++ b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java @@ -0,0 +1,24 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class GooglePayAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("google-pay:payment-request:started", + GooglePayAnalytics.PAYMENT_REQUEST_STARTED.getEvent()); + assertEquals("google-pay:payment-request:failed", + GooglePayAnalytics.PAYMENT_REQUEST_FAILED.getEvent()); + assertEquals("google-pay:payment-request:succeeded", + GooglePayAnalytics.PAYMENT_REQUEST_SUCCEEDED.getEvent()); + assertEquals("google-pay:tokenize:started", GooglePayAnalytics.TOKENIZE_STARTED.getEvent()); + assertEquals("google-pay:tokenize:failed", GooglePayAnalytics.TOKENIZE_FAILED.getEvent()); + assertEquals("google-pay:tokenize:network-connection:failed", + GooglePayAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.getEvent()); + assertEquals("google-pay:tokenize:succeeded", + GooglePayAnalytics.TOKENIZE_SUCCEEDED.getEvent()); + } +} From c0163afcdb14cec1e6354f1c9afb5455fdf303ca Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Tue, 7 Nov 2023 15:13:23 -0600 Subject: [PATCH 14/21] Add card and amex unit tests --- .../api/AmericanExpressAnalyticsUnitTest.java | 18 ++++++++++++++++++ .../api/CardAnalyticsUnitTest.java | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java create mode 100644 Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java diff --git a/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java new file mode 100644 index 0000000000..f234b70625 --- /dev/null +++ b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java @@ -0,0 +1,18 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class AmericanExpressAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("amex:rewards-balance:started", + AmericanExpressAnalytics.REWARDS_BALANCE_STARTED.getEvent()); + assertEquals("amex:rewards-balance:failed", + AmericanExpressAnalytics.REWARDS_BALANCE_FAILED.getEvent()); + assertEquals("amex:rewards-balance:succeeded", + AmericanExpressAnalytics.REWARDS_BALANCE_SUCCEEDED.getEvent()); + } +} diff --git a/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java new file mode 100644 index 0000000000..b570109bdf --- /dev/null +++ b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java @@ -0,0 +1,17 @@ +package com.braintreepayments.api; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class CardAnalyticsUnitTest { + + @Test + public void testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("card:tokenize:started", CardAnalytics.CARD_TOKENIZE_STARTED.getEvent()); + assertEquals("card:tokenize:failed", CardAnalytics.CARD_TOKENIZE_FAILED.getEvent()); + assertEquals("card:tokenize:succeeded", CardAnalytics.CARD_TOKENIZE_SUCCEEDED.getEvent()); + assertEquals("card:tokenize:network-connection:failed", + CardAnalytics.CARD_TOKENIZE_NETWORK_CONNECTION_LOST.getEvent()); + } +} From b40814095a18dc166d5aa43d7d110d2afc5a6a0c Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Wed, 8 Nov 2023 13:38:05 -0600 Subject: [PATCH 15/21] Remove outdated analytics events and convert to Kotlin --- .../api/AmericanExpressAnalytics.java | 21 -------- .../api/AmericanExpressAnalytics.kt | 9 ++++ .../api/AmericanExpressClient.java | 1 + .../api/AmericanExpressAnalyticsUnitTest.java | 18 ------- .../api/AmericanExpressAnalyticsUnitTest.kt | 22 ++++++++ .../braintreepayments/api/CardAnalytics.java | 20 -------- .../braintreepayments/api/CardAnalytics.kt | 9 ++++ .../api/CardAnalyticsUnitTest.java | 17 ------- .../api/CardAnalyticsUnitTest.kt | 13 +++++ ...ayAnalytics.java => GooglePayAnalytics.kt} | 17 ++----- .../api/GooglePayAnalyticsUnitTest.java | 24 --------- .../api/GooglePayAnalyticsUnitTest.kt | 34 +++++++++++++ .../api/LocalPaymentAnalytics.java | 30 ----------- .../api/LocalPaymentAnalytics.kt | 17 +++++++ .../api/LocalPaymentAnalyticsUnitTest.java | 28 ---------- .../api/LocalPaymentAnalyticsUnitTest.kt | 38 ++++++++++++++ .../api/PayPalAnalytics.java | 28 ---------- .../braintreepayments/api/PayPalAnalytics.kt | 16 ++++++ .../api/PayPalAnalyticsUnitTest.java | 24 --------- .../api/PayPalAnalyticsUnitTest.kt | 28 ++++++++++ .../api/PayPalNativeCheckoutAnalytics.java | 23 --------- .../api/PayPalNativeCheckoutAnalytics.kt | 13 +++++ ...PayPalNativeCheckoutAnalyticsUnitTest.java | 22 -------- .../PayPalNativeCheckoutAnalyticsUnitTest.kt | 30 +++++++++++ ...ytics.java => SEPADirectDebitAnalytics.kt} | 17 ++----- .../api/SEPADirectDebitAnalyticsUnitTest.java | 34 ------------- .../api/SEPADirectDebitAnalyticsUnitTest.kt | 51 +++++++++++++++++++ ...nalytics.java => ThreeDSecureAnalytics.kt} | 21 ++------ .../api/ThreeDSecureAnalyticsUnitTest.java | 31 ----------- .../api/ThreeDSecureAnalyticsUnitTest.kt | 39 ++++++++++++++ 30 files changed, 329 insertions(+), 366 deletions(-) delete mode 100644 AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java create mode 100644 AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt delete mode 100644 AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java create mode 100644 AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt delete mode 100644 Card/src/main/java/com/braintreepayments/api/CardAnalytics.java create mode 100644 Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt delete mode 100644 Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java create mode 100644 Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt rename GooglePay/src/main/java/com/braintreepayments/api/{GooglePayAnalytics.java => GooglePayAnalytics.kt} (50%) delete mode 100644 GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java create mode 100644 GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt delete mode 100644 LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java create mode 100644 LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.kt delete mode 100644 LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java create mode 100644 LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt delete mode 100644 PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java create mode 100644 PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt delete mode 100644 PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java create mode 100644 PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt delete mode 100644 PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java create mode 100644 PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.kt delete mode 100644 PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java create mode 100644 PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt rename SEPADirectDebit/src/main/java/com/braintreepayments/api/{SEPADirectDebitAnalytics.java => SEPADirectDebitAnalytics.kt} (66%) delete mode 100644 SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java create mode 100644 SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt rename ThreeDSecure/src/main/java/com/braintreepayments/api/{ThreeDSecureAnalytics.java => ThreeDSecureAnalytics.kt} (62%) delete mode 100644 ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java create mode 100644 ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java deleted file mode 100644 index f60ad7c778..0000000000 --- a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.braintreepayments.api; - -enum AmericanExpressAnalytics { - - // Get Rewards Balance Events - REWARDS_BALANCE_STARTED("amex:rewards-balance:started"), - REWARDS_BALANCE_FAILED("amex:rewards-balance:failed"), - REWARDS_BALANCE_SUCCEEDED("amex:rewards-balance:succeeded"); - - private final String event; - - AmericanExpressAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } -} - - diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt new file mode 100644 index 0000000000..0ac99b2ab1 --- /dev/null +++ b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt @@ -0,0 +1,9 @@ +package com.braintreepayments.api + +internal enum class AmericanExpressAnalytics(@JvmField val event: String) { + + // Get Rewards Balance Events + REWARDS_BALANCE_STARTED("amex:rewards-balance:started"), + REWARDS_BALANCE_FAILED("amex:rewards-balance:failed"), + REWARDS_BALANCE_SUCCEEDED("amex:rewards-balance:succeeded") +} diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java index e02bf7584a..2ac5e1570c 100644 --- a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java +++ b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java @@ -36,6 +36,7 @@ public void getRewardsBalance(@NonNull String nonce, @NonNull String currencyIso .appendQueryParameter("currencyIsoCode", currencyIsoCode) .build() .toString(); + String analytis = AmericanExpressAnalytics.REWARDS_BALANCE_SUCCEEDED.event; braintreeClient.sendAnalyticsEvent("amex.rewards-balance.start"); braintreeClient.sendGET(getRewardsBalanceUrl, (responseBody, httpError) -> { diff --git a/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java deleted file mode 100644 index f234b70625..0000000000 --- a/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class AmericanExpressAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("amex:rewards-balance:started", - AmericanExpressAnalytics.REWARDS_BALANCE_STARTED.getEvent()); - assertEquals("amex:rewards-balance:failed", - AmericanExpressAnalytics.REWARDS_BALANCE_FAILED.getEvent()); - assertEquals("amex:rewards-balance:succeeded", - AmericanExpressAnalytics.REWARDS_BALANCE_SUCCEEDED.getEvent()); - } -} diff --git a/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt new file mode 100644 index 0000000000..7419c14826 --- /dev/null +++ b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt @@ -0,0 +1,22 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AmericanExpressAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals( + "amex:rewards-balance:started", + AmericanExpressAnalytics.REWARDS_BALANCE_STARTED.event + ) + assertEquals( + "amex:rewards-balance:failed", + AmericanExpressAnalytics.REWARDS_BALANCE_FAILED.event + ) + assertEquals( + "amex:rewards-balance:succeeded", + AmericanExpressAnalytics.REWARDS_BALANCE_SUCCEEDED.event + ) + } +} diff --git a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java deleted file mode 100644 index 7353b95cd4..0000000000 --- a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.braintreepayments.api; - -enum CardAnalytics { - - // Tokenize Events - CARD_TOKENIZE_STARTED("card:tokenize:started"), - CARD_TOKENIZE_FAILED("card:tokenize:failed"), - CARD_TOKENIZE_SUCCEEDED("card:tokenize:succeeded"), - CARD_TOKENIZE_NETWORK_CONNECTION_LOST("card:tokenize:network-connection:failed"); - - private final String event; - - CardAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } -} diff --git a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt new file mode 100644 index 0000000000..ffad0d481f --- /dev/null +++ b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt @@ -0,0 +1,9 @@ +package com.braintreepayments.api + +internal enum class CardAnalytics(@JvmField val event: String) { + + // Tokenize Events + CARD_TOKENIZE_STARTED("card:tokenize:started"), + CARD_TOKENIZE_FAILED("card:tokenize:failed"), + CARD_TOKENIZE_SUCCEEDED("card:tokenize:succeeded") +} diff --git a/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java deleted file mode 100644 index b570109bdf..0000000000 --- a/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class CardAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("card:tokenize:started", CardAnalytics.CARD_TOKENIZE_STARTED.getEvent()); - assertEquals("card:tokenize:failed", CardAnalytics.CARD_TOKENIZE_FAILED.getEvent()); - assertEquals("card:tokenize:succeeded", CardAnalytics.CARD_TOKENIZE_SUCCEEDED.getEvent()); - assertEquals("card:tokenize:network-connection:failed", - CardAnalytics.CARD_TOKENIZE_NETWORK_CONNECTION_LOST.getEvent()); - } -} diff --git a/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt new file mode 100644 index 0000000000..b8224e79a9 --- /dev/null +++ b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt @@ -0,0 +1,13 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class CardAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("card:tokenize:started", CardAnalytics.CARD_TOKENIZE_STARTED.event) + assertEquals("card:tokenize:failed", CardAnalytics.CARD_TOKENIZE_FAILED.event) + assertEquals("card:tokenize:succeeded", CardAnalytics.CARD_TOKENIZE_SUCCEEDED.event) + } +} diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt similarity index 50% rename from GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java rename to GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt index 78f3d46a97..9e82ecb3be 100644 --- a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.java +++ b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt @@ -1,6 +1,6 @@ -package com.braintreepayments.api; +package com.braintreepayments.api -enum GooglePayAnalytics { +internal enum class GooglePayAnalytics(@JvmField val event: String) { // Payment Data Request Events PAYMENT_REQUEST_STARTED("google-pay:payment-request:started"), @@ -10,16 +10,5 @@ enum GooglePayAnalytics { // Tokenize Events TOKENIZE_STARTED("google-pay:tokenize:started"), TOKENIZE_FAILED("google-pay:tokenize:failed"), - TOKENIZE_NETWORK_CONNECTION_LOST("google-pay:tokenize:network-connection:failed"), - TOKENIZE_SUCCEEDED("google-pay:tokenize:succeeded"); - - private final String event; - - GooglePayAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } + TOKENIZE_SUCCEEDED("google-pay:tokenize:succeeded") } diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java deleted file mode 100644 index 228df53b05..0000000000 --- a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class GooglePayAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("google-pay:payment-request:started", - GooglePayAnalytics.PAYMENT_REQUEST_STARTED.getEvent()); - assertEquals("google-pay:payment-request:failed", - GooglePayAnalytics.PAYMENT_REQUEST_FAILED.getEvent()); - assertEquals("google-pay:payment-request:succeeded", - GooglePayAnalytics.PAYMENT_REQUEST_SUCCEEDED.getEvent()); - assertEquals("google-pay:tokenize:started", GooglePayAnalytics.TOKENIZE_STARTED.getEvent()); - assertEquals("google-pay:tokenize:failed", GooglePayAnalytics.TOKENIZE_FAILED.getEvent()); - assertEquals("google-pay:tokenize:network-connection:failed", - GooglePayAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.getEvent()); - assertEquals("google-pay:tokenize:succeeded", - GooglePayAnalytics.TOKENIZE_SUCCEEDED.getEvent()); - } -} diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt new file mode 100644 index 0000000000..74effbc89e --- /dev/null +++ b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt @@ -0,0 +1,34 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class GooglePayAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals( + "google-pay:payment-request:started", + GooglePayAnalytics.PAYMENT_REQUEST_STARTED.event + ) + assertEquals( + "google-pay:payment-request:failed", + GooglePayAnalytics.PAYMENT_REQUEST_FAILED.event + ) + assertEquals( + "google-pay:payment-request:succeeded", + GooglePayAnalytics.PAYMENT_REQUEST_SUCCEEDED.event + ) + assertEquals( + "google-pay:tokenize:started", + GooglePayAnalytics.TOKENIZE_STARTED.event + ) + assertEquals( + "google-pay:tokenize:failed", + GooglePayAnalytics.TOKENIZE_FAILED.event + ) + assertEquals( + "google-pay:tokenize:succeeded", + GooglePayAnalytics.TOKENIZE_SUCCEEDED.event + ) + } +} diff --git a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java deleted file mode 100644 index 1073db8c38..0000000000 --- a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.braintreepayments.api; - -enum LocalPaymentAnalytics { - - // Conversion Events - PAYMENT_STARTED("local-payment:start-payment:started"), - PAYMENT_SUCCEEDED("local-payment:start-payment:succeeded"), - PAYMENT_FAILED("local-payment:start-payment:failed"), - PAYMENT_CANCELED("local-payment:start-payment:browser-login:canceled"), - - // Browser Presentation Events - BROWSER_PRESENTATION_SUCCEEDED("local-payment:start-payment:browser-presentation:succeeded"), - BROWSER_PRESENTATION_FAILED("local-payment:start-payment:browser-presentation:failed"), - - // Browser Login Events - BROWSER_LOGIN_FAILED("local-payment:start-payment:browser-login:failed"), - - // Network Connection Event - PAYMENT_NETWORK_CONNECTION_LOST("local-payment:start-payment:network-connection:failed"); - - private final String event; - - LocalPaymentAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } -} diff --git a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.kt b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.kt new file mode 100644 index 0000000000..4d8d9434df --- /dev/null +++ b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentAnalytics.kt @@ -0,0 +1,17 @@ +package com.braintreepayments.api + +internal enum class LocalPaymentAnalytics(@JvmField val event: String) { + + // Conversion Events + PAYMENT_STARTED("local-payment:start-payment:started"), + PAYMENT_SUCCEEDED("local-payment:start-payment:succeeded"), + PAYMENT_FAILED("local-payment:start-payment:failed"), + PAYMENT_CANCELED("local-payment:start-payment:browser-login:canceled"), + + // Browser Presentation Events + BROWSER_SWITCH_SUCCEEDED("local-payment:start-payment:browser-presentation:succeeded"), + BROWSER_SWITCH_FAILED("local-payment:start-payment:browser-presentation:failed"), + + // Browser Login Events + BROWSER_LOGIN_FAILED("local-payment:start-payment:browser-login:failed") +} diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java deleted file mode 100644 index 72ebc1d8db..0000000000 --- a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class LocalPaymentAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("local-payment:start-payment:started", - LocalPaymentAnalytics.PAYMENT_STARTED.getEvent()); - assertEquals("local-payment:start-payment:succeeded", - LocalPaymentAnalytics.PAYMENT_SUCCEEDED.getEvent()); - assertEquals("local-payment:start-payment:failed", - LocalPaymentAnalytics.PAYMENT_FAILED.getEvent()); - assertEquals("local-payment:start-payment:browser-login:canceled", - LocalPaymentAnalytics.PAYMENT_CANCELED.getEvent()); - assertEquals("local-payment:start-payment:browser-presentation:succeeded", - LocalPaymentAnalytics.BROWSER_PRESENTATION_SUCCEEDED.getEvent()); - assertEquals("local-payment:start-payment:browser-presentation:failed", - LocalPaymentAnalytics.BROWSER_PRESENTATION_FAILED.getEvent()); - assertEquals("local-payment:start-payment:browser-login:failed", - LocalPaymentAnalytics.BROWSER_LOGIN_FAILED.getEvent()); - assertEquals("local-payment:start-payment:network-connection:failed", - LocalPaymentAnalytics.PAYMENT_NETWORK_CONNECTION_LOST.getEvent()); - } -} diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt new file mode 100644 index 0000000000..fb4b899995 --- /dev/null +++ b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt @@ -0,0 +1,38 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class LocalPaymentAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals( + "local-payment:start-payment:started", + LocalPaymentAnalytics.PAYMENT_STARTED.event + ) + assertEquals( + "local-payment:start-payment:succeeded", + LocalPaymentAnalytics.PAYMENT_SUCCEEDED.event + ) + assertEquals( + "local-payment:start-payment:failed", + LocalPaymentAnalytics.PAYMENT_FAILED.event + ) + assertEquals( + "local-payment:start-payment:browser-login:canceled", + LocalPaymentAnalytics.PAYMENT_CANCELED.event + ) + assertEquals( + "local-payment:start-payment:browser-presentation:succeeded", + LocalPaymentAnalytics.BROWSER_SWITCH_SUCCEEDED.event + ) + assertEquals( + "local-payment:start-payment:browser-presentation:failed", + LocalPaymentAnalytics.BROWSER_SWITCH_FAILED.event + ) + assertEquals( + "local-payment:start-payment:browser-login:failed", + LocalPaymentAnalytics.BROWSER_LOGIN_FAILED.event + ) + } +} diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java deleted file mode 100644 index e96d52945c..0000000000 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.braintreepayments.api; - -enum PayPalAnalytics { - - // Tokenize Events - TOKENIZATION_STARTED("paypal:tokenize:started"), - TOKENIZATION_FAILED("paypal:tokenize:failed"), - TOKENIZATION_SUCCEEDED("paypal:tokenize:succeeded"), - TOKENIZATION_NETWORK_CONNECTION_FAILED("paypal:tokenize:network-connection:failed"), - - // Browser Presentation Events - BROWSER_PRESENTATION_SUCCEEDED("paypal:tokenize:browser-presentation:succeeded"), - BROWSER_PRESENTATION_FAILED("paypal:tokenize:browser-presentation:failed"), - - // Browser Login Events - BROWSER_LOGIN_CANCELED("paypal:tokenize:browser-login:canceled"); - - private final String event; - - PayPalAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } -} - diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt new file mode 100644 index 0000000000..7c7f457520 --- /dev/null +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt @@ -0,0 +1,16 @@ +package com.braintreepayments.api + +internal enum class PayPalAnalytics(@JvmField val event: String) { + + // Tokenize Events + TOKENIZATION_STARTED("paypal:tokenize:started"), + TOKENIZATION_FAILED("paypal:tokenize:failed"), + TOKENIZATION_SUCCEEDED("paypal:tokenize:succeeded"), + + // Browser Presentation Events + BROWSER_SWITCH_SUCCEEDED("paypal:tokenize:browser-presentation:succeeded"), + BROWSER_SWITCH_FAILED("paypal:tokenize:browser-presentation:failed"), + + // Browser Login Events + BROWSER_LOGIN_CANCELED("paypal:tokenize:browser-login:canceled") +} diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java deleted file mode 100644 index 2162b532cf..0000000000 --- a/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class PayPalAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("paypal:tokenize:started", PayPalAnalytics.TOKENIZATION_STARTED.getEvent()); - assertEquals("paypal:tokenize:failed", PayPalAnalytics.TOKENIZATION_FAILED.getEvent()); - assertEquals("paypal:tokenize:succeeded", - PayPalAnalytics.TOKENIZATION_SUCCEEDED.getEvent()); - assertEquals("paypal:tokenize:network-connection:failed", - PayPalAnalytics.TOKENIZATION_NETWORK_CONNECTION_FAILED.getEvent()); - assertEquals("paypal:tokenize:browser-presentation:succeeded", - PayPalAnalytics.BROWSER_PRESENTATION_SUCCEEDED.getEvent()); - assertEquals("paypal:tokenize:browser-presentation:failed", - PayPalAnalytics.BROWSER_PRESENTATION_FAILED.getEvent()); - assertEquals("paypal:tokenize:browser-login:canceled", - PayPalAnalytics.BROWSER_LOGIN_CANCELED.getEvent()); - } -} diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt new file mode 100644 index 0000000000..3036b24fea --- /dev/null +++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt @@ -0,0 +1,28 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class PayPalAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("paypal:tokenize:started", PayPalAnalytics.TOKENIZATION_STARTED.event) + assertEquals("paypal:tokenize:failed", PayPalAnalytics.TOKENIZATION_FAILED.event) + assertEquals( + "paypal:tokenize:succeeded", + PayPalAnalytics.TOKENIZATION_SUCCEEDED.event + ) + assertEquals( + "paypal:tokenize:browser-presentation:succeeded", + PayPalAnalytics.BROWSER_SWITCH_SUCCEEDED.event + ) + assertEquals( + "paypal:tokenize:browser-presentation:failed", + PayPalAnalytics.BROWSER_SWITCH_FAILED.event + ) + assertEquals( + "paypal:tokenize:browser-login:canceled", + PayPalAnalytics.BROWSER_LOGIN_CANCELED.event + ) + } +} diff --git a/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java b/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java deleted file mode 100644 index c72ce95636..0000000000 --- a/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.braintreepayments.api; - -enum PayPalNativeCheckoutAnalytics { - - // Conversion Events - TOKENIZATION_STARTED( "paypal-native:tokenize:started"), - TOKENIZATION_FAILED("paypal-native:tokenize:failed"), - TOKENIZATION_SUCCEEDED("paypal-native:tokenize:succeeded"), - TOKENIZATION_CANCELED("paypal-native:tokenize:canceled"), - - // Additional Detail Events - ORDER_CREATION_FAILED("paypal-native:tokenize:order-creation:failed"); - - private final String event; - - PayPalNativeCheckoutAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } -} diff --git a/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.kt b/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.kt new file mode 100644 index 0000000000..662c6efd6d --- /dev/null +++ b/PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutAnalytics.kt @@ -0,0 +1,13 @@ +package com.braintreepayments.api + +internal enum class PayPalNativeCheckoutAnalytics(@JvmField val event: String) { + + // Conversion Events + TOKENIZATION_STARTED("paypal-native:tokenize:started"), + TOKENIZATION_FAILED("paypal-native:tokenize:failed"), + TOKENIZATION_SUCCEEDED("paypal-native:tokenize:succeeded"), + TOKENIZATION_CANCELED("paypal-native:tokenize:canceled"), + + // Additional Detail Events + ORDER_CREATION_FAILED("paypal-native:tokenize:order-creation:failed") +} diff --git a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java deleted file mode 100644 index f693f39b50..0000000000 --- a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class PayPalNativeCheckoutAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("paypal-native:tokenize:started", - PayPalNativeCheckoutAnalytics.TOKENIZATION_STARTED.getEvent()); - assertEquals("paypal-native:tokenize:failed", - PayPalNativeCheckoutAnalytics.TOKENIZATION_FAILED.getEvent()); - assertEquals("paypal-native:tokenize:succeeded", - PayPalNativeCheckoutAnalytics.TOKENIZATION_SUCCEEDED.getEvent()); - assertEquals("paypal-native:tokenize:canceled", - PayPalNativeCheckoutAnalytics.TOKENIZATION_CANCELED.getEvent()); - assertEquals("paypal-native:tokenize:order-creation:failed", - PayPalNativeCheckoutAnalytics.ORDER_CREATION_FAILED.getEvent()); - } -} diff --git a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt new file mode 100644 index 0000000000..494196ec13 --- /dev/null +++ b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt @@ -0,0 +1,30 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class PayPalNativeCheckoutAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals( + "paypal-native:tokenize:started", + PayPalNativeCheckoutAnalytics.TOKENIZATION_STARTED.event + ) + assertEquals( + "paypal-native:tokenize:failed", + PayPalNativeCheckoutAnalytics.TOKENIZATION_FAILED.event + ) + assertEquals( + "paypal-native:tokenize:succeeded", + PayPalNativeCheckoutAnalytics.TOKENIZATION_SUCCEEDED.event + ) + assertEquals( + "paypal-native:tokenize:canceled", + PayPalNativeCheckoutAnalytics.TOKENIZATION_CANCELED.event + ) + assertEquals( + "paypal-native:tokenize:order-creation:failed", + PayPalNativeCheckoutAnalytics.ORDER_CREATION_FAILED.event + ) + } +} diff --git a/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java b/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.kt similarity index 66% rename from SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java rename to SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.kt index f955487d9c..95a7976f17 100644 --- a/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.java +++ b/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitAnalytics.kt @@ -1,6 +1,6 @@ -package com.braintreepayments.api; +package com.braintreepayments.api -enum SEPADirectDebitAnalytics { +internal enum class SEPADirectDebitAnalytics(@JvmField val event: String) { // Conversion Events TOKENIZE_STARTED("sepa:tokenize:started"), @@ -14,17 +14,6 @@ enum SEPADirectDebitAnalytics { CREATE_MANDATE_FAILED("sepa:tokenize:create-mandate:failed"), CHALLENGE_PRESENTATION_SUCCEEDED("sepa:tokenize:challenge-presentation:succeeded"), CHALLENGE_PRESENTATION_FAILED("sepa:tokenize:challenge-presentation:failed"), - CHALLENGE_ALERT_CANCELED("sepa:tokenize:challenge:alert-canceled"), CHALLENGE_SUCCEEDED("sepa:tokenize:challenge:succeeded"), - CHALLENGE_FAILED("sepa:tokenize:challenge:failed"); - - private final String event; - - SEPADirectDebitAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } + CHALLENGE_FAILED("sepa:tokenize:challenge:failed") } diff --git a/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java deleted file mode 100644 index 2b55a42fd5..0000000000 --- a/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class SEPADirectDebitAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("sepa:tokenize:started", SEPADirectDebitAnalytics.TOKENIZE_STARTED.getEvent()); - assertEquals("sepa:tokenize:succeeded", - SEPADirectDebitAnalytics.TOKENIZE_SUCCEEDED.getEvent()); - assertEquals("sepa:tokenize:failed", SEPADirectDebitAnalytics.TOKENIZE_FAILED.getEvent()); - assertEquals("sepa:tokenize:challenge:canceled", - SEPADirectDebitAnalytics.CHALLENGE_CANCELED.getEvent()); - assertEquals("sepa:tokenize:create-mandate:challenge-required", - SEPADirectDebitAnalytics.CREATE_MANDATE_CHALLENGE_REQUIRED.getEvent()); - assertEquals("sepa:tokenize:create-mandate:succeeded", - SEPADirectDebitAnalytics.CREATE_MANDATE_SUCCEEDED.getEvent()); - assertEquals("sepa:tokenize:create-mandate:failed", - SEPADirectDebitAnalytics.CREATE_MANDATE_FAILED.getEvent()); - assertEquals("sepa:tokenize:challenge-presentation:succeeded", - SEPADirectDebitAnalytics.CHALLENGE_PRESENTATION_SUCCEEDED.getEvent()); - assertEquals("sepa:tokenize:challenge-presentation:failed", - SEPADirectDebitAnalytics.CHALLENGE_PRESENTATION_FAILED.getEvent()); - assertEquals("sepa:tokenize:challenge:alert-canceled", - SEPADirectDebitAnalytics.CHALLENGE_ALERT_CANCELED.getEvent()); - assertEquals("sepa:tokenize:challenge:succeeded", - SEPADirectDebitAnalytics.CHALLENGE_SUCCEEDED.getEvent()); - assertEquals("sepa:tokenize:challenge:failed", - SEPADirectDebitAnalytics.CHALLENGE_FAILED.getEvent()); - } -} diff --git a/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt new file mode 100644 index 0000000000..cfa7f7295f --- /dev/null +++ b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt @@ -0,0 +1,51 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class SEPADirectDebitAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals( + "sepa:tokenize:started", + SEPADirectDebitAnalytics.TOKENIZE_STARTED.event + ) + assertEquals( + "sepa:tokenize:succeeded", + SEPADirectDebitAnalytics.TOKENIZE_SUCCEEDED.event + ) + assertEquals("sepa:tokenize:failed", SEPADirectDebitAnalytics.TOKENIZE_FAILED.event) + assertEquals( + "sepa:tokenize:challenge:canceled", + SEPADirectDebitAnalytics.CHALLENGE_CANCELED.event + ) + assertEquals( + "sepa:tokenize:create-mandate:challenge-required", + SEPADirectDebitAnalytics.CREATE_MANDATE_CHALLENGE_REQUIRED.event + ) + assertEquals( + "sepa:tokenize:create-mandate:succeeded", + SEPADirectDebitAnalytics.CREATE_MANDATE_SUCCEEDED.event + ) + assertEquals( + "sepa:tokenize:create-mandate:failed", + SEPADirectDebitAnalytics.CREATE_MANDATE_FAILED.event + ) + assertEquals( + "sepa:tokenize:challenge-presentation:succeeded", + SEPADirectDebitAnalytics.CHALLENGE_PRESENTATION_SUCCEEDED.event + ) + assertEquals( + "sepa:tokenize:challenge-presentation:failed", + SEPADirectDebitAnalytics.CHALLENGE_PRESENTATION_FAILED.event + ) + assertEquals( + "sepa:tokenize:challenge:succeeded", + SEPADirectDebitAnalytics.CHALLENGE_SUCCEEDED.event + ) + assertEquals( + "sepa:tokenize:challenge:failed", + SEPADirectDebitAnalytics.CHALLENGE_FAILED.event + ) + } +} diff --git a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.kt similarity index 62% rename from ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java rename to ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.kt index b92b67ea34..d61aa3dda7 100644 --- a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.java +++ b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureAnalytics.kt @@ -1,12 +1,11 @@ -package com.braintreepayments.api; +package com.braintreepayments.api -enum ThreeDSecureAnalytics { +internal enum class ThreeDSecureAnalytics(@JvmField val event: String) { // Conversion Events VERIFY_STARTED("3ds:verify:started"), VERIFY_SUCCEEDED("3ds:verify:succeeded"), VERIFY_FAILED("3ds:verify:failed"), - // cardinal sdk returns a cancellation result VERIFY_CANCELED("3ds:verify:canceled"), @@ -15,25 +14,11 @@ enum ThreeDSecureAnalytics { LOOKUP_FAILED("3ds:verify:lookup:failed"), CHALLENGE_REQUIRED("3ds:verify:lookup:challenge-required"), - // Network Connection Lost - NETWORK_CONNECTION_LOST("3ds:verify:lookup:network-connection:failed"), - // Challenge Events CHALLENGE_SUCCEEDED("3ds:verify:challenge.succeeded"), CHALLENGE_FAILED("3ds:verify:challenge.failed"), // JWT Events JWT_AUTH_SUCCEEDED("3ds:verify:authenticate-jwt:succeeded"), - JWT_AUTH_FAILED("3ds:verify:authenticate-jwt:failed"); - - private final String event; - - ThreeDSecureAnalytics(String event) { - this.event = event; - } - - String getEvent() { - return event; - } + JWT_AUTH_FAILED("3ds:verify:authenticate-jwt:failed") } - diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java deleted file mode 100644 index 34562e0b3a..0000000000 --- a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class ThreeDSecureAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("3ds:verify:started", ThreeDSecureAnalytics.VERIFY_STARTED.getEvent()); - assertEquals("3ds:verify:succeeded", ThreeDSecureAnalytics.VERIFY_SUCCEEDED.getEvent()); - assertEquals("3ds:verify:failed", ThreeDSecureAnalytics.VERIFY_FAILED.getEvent()); - assertEquals("3ds:verify:canceled", ThreeDSecureAnalytics.VERIFY_CANCELED.getEvent()); - assertEquals("3ds:verify:lookup:succeeded", - ThreeDSecureAnalytics.LOOKUP_SUCCEEDED.getEvent()); - assertEquals("3ds:verify:lookup:failed", ThreeDSecureAnalytics.LOOKUP_FAILED.getEvent()); - assertEquals("3ds:verify:lookup:challenge-required", - ThreeDSecureAnalytics.CHALLENGE_REQUIRED.getEvent()); - assertEquals("3ds:verify:lookup:network-connection:failed", - ThreeDSecureAnalytics.NETWORK_CONNECTION_LOST.getEvent()); - assertEquals("3ds:verify:challenge.succeeded", - ThreeDSecureAnalytics.CHALLENGE_SUCCEEDED.getEvent()); - assertEquals("3ds:verify:challenge.failed", - ThreeDSecureAnalytics.CHALLENGE_FAILED.getEvent()); - assertEquals("3ds:verify:authenticate-jwt:succeeded", - ThreeDSecureAnalytics.JWT_AUTH_SUCCEEDED.getEvent()); - assertEquals("3ds:verify:authenticate-jwt:failed", - ThreeDSecureAnalytics.JWT_AUTH_FAILED.getEvent()); - } -} diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt new file mode 100644 index 0000000000..5bbbb6d035 --- /dev/null +++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt @@ -0,0 +1,39 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class ThreeDSecureAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals("3ds:verify:started", ThreeDSecureAnalytics.VERIFY_STARTED.event) + assertEquals("3ds:verify:succeeded", ThreeDSecureAnalytics.VERIFY_SUCCEEDED.event) + assertEquals("3ds:verify:failed", ThreeDSecureAnalytics.VERIFY_FAILED.event) + assertEquals("3ds:verify:canceled", ThreeDSecureAnalytics.VERIFY_CANCELED.event) + assertEquals( + "3ds:verify:lookup:succeeded", + ThreeDSecureAnalytics.LOOKUP_SUCCEEDED.event + ) + assertEquals("3ds:verify:lookup:failed", ThreeDSecureAnalytics.LOOKUP_FAILED.event) + assertEquals( + "3ds:verify:lookup:challenge-required", + ThreeDSecureAnalytics.CHALLENGE_REQUIRED.event + ) + assertEquals( + "3ds:verify:challenge.succeeded", + ThreeDSecureAnalytics.CHALLENGE_SUCCEEDED.event + ) + assertEquals( + "3ds:verify:challenge.failed", + ThreeDSecureAnalytics.CHALLENGE_FAILED.event + ) + assertEquals( + "3ds:verify:authenticate-jwt:succeeded", + ThreeDSecureAnalytics.JWT_AUTH_SUCCEEDED.event + ) + assertEquals( + "3ds:verify:authenticate-jwt:failed", + ThreeDSecureAnalytics.JWT_AUTH_FAILED.event + ) + } +} From fcdf942328a10f3f7442ece2ac81cc1703c5387f Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Wed, 8 Nov 2023 13:50:24 -0600 Subject: [PATCH 16/21] Cleanup internal comments and convert Venmo --- .../api/AmericanExpressAnalytics.kt | 1 - .../braintreepayments/api/CardAnalytics.kt | 1 - .../api/GooglePayAnalytics.kt | 2 -- .../braintreepayments/api/PayPalAnalytics.kt | 7 ++--- ...{VenmoAnalytics.java => VenmoAnalytics.kt} | 16 ++-------- .../api/VenmoAnalyticsUnitTest.java | 24 --------------- .../api/VenmoAnalyticsUnitTest.kt | 29 +++++++++++++++++++ 7 files changed, 35 insertions(+), 45 deletions(-) rename Venmo/src/main/java/com/braintreepayments/api/{VenmoAnalytics.java => VenmoAnalytics.kt} (60%) delete mode 100644 Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java create mode 100644 Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt index 0ac99b2ab1..4fd9f54ab2 100644 --- a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt +++ b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressAnalytics.kt @@ -2,7 +2,6 @@ package com.braintreepayments.api internal enum class AmericanExpressAnalytics(@JvmField val event: String) { - // Get Rewards Balance Events REWARDS_BALANCE_STARTED("amex:rewards-balance:started"), REWARDS_BALANCE_FAILED("amex:rewards-balance:failed"), REWARDS_BALANCE_SUCCEEDED("amex:rewards-balance:succeeded") diff --git a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt index ffad0d481f..6016e7c9ee 100644 --- a/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt +++ b/Card/src/main/java/com/braintreepayments/api/CardAnalytics.kt @@ -2,7 +2,6 @@ package com.braintreepayments.api internal enum class CardAnalytics(@JvmField val event: String) { - // Tokenize Events CARD_TOKENIZE_STARTED("card:tokenize:started"), CARD_TOKENIZE_FAILED("card:tokenize:failed"), CARD_TOKENIZE_SUCCEEDED("card:tokenize:succeeded") diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt index 9e82ecb3be..bde26559ec 100644 --- a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt +++ b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt @@ -2,12 +2,10 @@ package com.braintreepayments.api internal enum class GooglePayAnalytics(@JvmField val event: String) { - // Payment Data Request Events PAYMENT_REQUEST_STARTED("google-pay:payment-request:started"), PAYMENT_REQUEST_FAILED("google-pay:payment-request:failed"), PAYMENT_REQUEST_SUCCEEDED("google-pay:payment-request:succeeded"), - // Tokenize Events TOKENIZE_STARTED("google-pay:tokenize:started"), TOKENIZE_FAILED("google-pay:tokenize:failed"), TOKENIZE_SUCCEEDED("google-pay:tokenize:succeeded") diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt index 7c7f457520..119b404e24 100644 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt @@ -2,15 +2,14 @@ package com.braintreepayments.api internal enum class PayPalAnalytics(@JvmField val event: String) { - // Tokenize Events + // Conversion Events TOKENIZATION_STARTED("paypal:tokenize:started"), TOKENIZATION_FAILED("paypal:tokenize:failed"), TOKENIZATION_SUCCEEDED("paypal:tokenize:succeeded"), + BROWSER_LOGIN_CANCELED("paypal:tokenize:browser-login:canceled"), // Browser Presentation Events BROWSER_SWITCH_SUCCEEDED("paypal:tokenize:browser-presentation:succeeded"), - BROWSER_SWITCH_FAILED("paypal:tokenize:browser-presentation:failed"), + BROWSER_SWITCH_FAILED("paypal:tokenize:browser-presentation:failed") - // Browser Login Events - BROWSER_LOGIN_CANCELED("paypal:tokenize:browser-login:canceled") } diff --git a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt similarity index 60% rename from Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java rename to Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt index 1a9b4e43ec..29aa18ddff 100644 --- a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.java +++ b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt @@ -1,7 +1,6 @@ -package com.braintreepayments.api; - -enum VenmoAnalytics { +package com.braintreepayments.api +internal enum class VenmoAnalytics(@JvmField val event: String) { // Conversion Events TOKENIZE_STARTED("venmo:tokenize:started"), TOKENIZE_FAILED("venmo:tokenize:failed"), @@ -11,15 +10,6 @@ enum VenmoAnalytics { // Additional Detail Events TOKENIZE_NETWORK_CONNECTION_LOST("venmo:tokenize:network-connection:failed"), APP_SWITCH_SUCCEEDED("venmo:tokenize:app-switch:succeeded"), - APP_SWITCH_FAILED("venmo:tokenize:app-switch:failed"); - - private final String event; - - VenmoAnalytics(String event) { - this.event = event; - } + APP_SWITCH_FAILED("venmo:tokenize:app-switch:failed") - String getEvent() { - return event; - } } diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java deleted file mode 100644 index a1f29535bd..0000000000 --- a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.braintreepayments.api; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class VenmoAnalyticsUnitTest { - - @Test - public void testAnalyticsEvents_sendsExpectedEventNames() { - assertEquals("venmo:tokenize:app-switch:canceled", - VenmoAnalytics.APP_SWITCH_CANCELED.getEvent()); - assertEquals("venmo:tokenize:app-switch:failed", - VenmoAnalytics.APP_SWITCH_FAILED.getEvent()); - assertEquals("venmo:tokenize:app-switch:succeeded", - VenmoAnalytics.APP_SWITCH_SUCCEEDED.getEvent()); - assertEquals("venmo:tokenize:failed", VenmoAnalytics.TOKENIZE_FAILED.getEvent()); - assertEquals("venmo:tokenize:started", VenmoAnalytics.TOKENIZE_STARTED.getEvent()); - assertEquals("venmo:tokenize:succeeded", VenmoAnalytics.TOKENIZE_SUCCEEDED.getEvent()); - assertEquals("venmo:tokenize:network-connection:failed", - VenmoAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.getEvent()); - } - -} diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt new file mode 100644 index 0000000000..b427969751 --- /dev/null +++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt @@ -0,0 +1,29 @@ +package com.braintreepayments.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +class VenmoAnalyticsUnitTest { + @Test + fun testAnalyticsEvents_sendsExpectedEventNames() { + assertEquals( + "venmo:tokenize:app-switch:canceled", + VenmoAnalytics.APP_SWITCH_CANCELED.event + ) + assertEquals( + "venmo:tokenize:app-switch:failed", + VenmoAnalytics.APP_SWITCH_FAILED.event + ) + assertEquals( + "venmo:tokenize:app-switch:succeeded", + VenmoAnalytics.APP_SWITCH_SUCCEEDED.event + ) + assertEquals("venmo:tokenize:failed", VenmoAnalytics.TOKENIZE_FAILED.event) + assertEquals("venmo:tokenize:started", VenmoAnalytics.TOKENIZE_STARTED.event) + assertEquals("venmo:tokenize:succeeded", VenmoAnalytics.TOKENIZE_SUCCEEDED.event) + assertEquals( + "venmo:tokenize:network-connection:failed", + VenmoAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.event + ) + } +} \ No newline at end of file From 65d225aca2a02ee3909e93634b94f5664a4ee135 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Wed, 8 Nov 2023 13:57:50 -0600 Subject: [PATCH 17/21] Fix detekt errors --- .../src/main/java/com/braintreepayments/api/PayPalAnalytics.kt | 1 - Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt | 1 - .../java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt index 119b404e24..f9641bd63c 100644 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalAnalytics.kt @@ -11,5 +11,4 @@ internal enum class PayPalAnalytics(@JvmField val event: String) { // Browser Presentation Events BROWSER_SWITCH_SUCCEEDED("paypal:tokenize:browser-presentation:succeeded"), BROWSER_SWITCH_FAILED("paypal:tokenize:browser-presentation:failed") - } diff --git a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt index 29aa18ddff..11931e37fc 100644 --- a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt +++ b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt @@ -11,5 +11,4 @@ internal enum class VenmoAnalytics(@JvmField val event: String) { TOKENIZE_NETWORK_CONNECTION_LOST("venmo:tokenize:network-connection:failed"), APP_SWITCH_SUCCEEDED("venmo:tokenize:app-switch:succeeded"), APP_SWITCH_FAILED("venmo:tokenize:app-switch:failed") - } diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt index b427969751..44ff8ec889 100644 --- a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt +++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt @@ -26,4 +26,4 @@ class VenmoAnalyticsUnitTest { VenmoAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.event ) } -} \ No newline at end of file +} From 73a0b0e4902255306f0652dca1c277aabfc603ab Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Wed, 8 Nov 2023 14:03:55 -0600 Subject: [PATCH 18/21] Fix spacing --- .../braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt | 1 + .../test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt | 1 + .../java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt | 1 + .../com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt | 1 + .../java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt | 1 + .../api/PayPalNativeCheckoutAnalyticsUnitTest.kt | 1 + .../braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt | 1 + .../com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt | 1 + Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt | 1 + .../java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt | 1 + 10 files changed, 10 insertions(+) diff --git a/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt index 7419c14826..31bf6bd46e 100644 --- a/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt +++ b/AmericanExpress/src/test/java/com/braintreepayments/api/AmericanExpressAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class AmericanExpressAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals( diff --git a/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt index b8224e79a9..c0f04534af 100644 --- a/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt +++ b/Card/src/test/java/com/braintreepayments/api/CardAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class CardAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals("card:tokenize:started", CardAnalytics.CARD_TOKENIZE_STARTED.event) diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt index 74effbc89e..6a4489c981 100644 --- a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt +++ b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class GooglePayAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals( diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt index fb4b899995..8d84e94f3f 100644 --- a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt +++ b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class LocalPaymentAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals( diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt index 3036b24fea..e3fc2de6fa 100644 --- a/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt +++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class PayPalAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals("paypal:tokenize:started", PayPalAnalytics.TOKENIZATION_STARTED.event) diff --git a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt index 494196ec13..5c64cc3e07 100644 --- a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt +++ b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class PayPalNativeCheckoutAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals( diff --git a/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt index cfa7f7295f..ca2babb9bf 100644 --- a/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt +++ b/SEPADirectDebit/src/test/java/com/braintreepayments/api/SEPADirectDebitAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class SEPADirectDebitAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals( diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt index 5bbbb6d035..30578603a6 100644 --- a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt +++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class ThreeDSecureAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals("3ds:verify:started", ThreeDSecureAnalytics.VERIFY_STARTED.event) diff --git a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt index 11931e37fc..e0c72b55d6 100644 --- a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt +++ b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt @@ -1,6 +1,7 @@ package com.braintreepayments.api internal enum class VenmoAnalytics(@JvmField val event: String) { + // Conversion Events TOKENIZE_STARTED("venmo:tokenize:started"), TOKENIZE_FAILED("venmo:tokenize:failed"), diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt index 44ff8ec889..cac89aea46 100644 --- a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt +++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt @@ -4,6 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Test class VenmoAnalyticsUnitTest { + @Test fun testAnalyticsEvents_sendsExpectedEventNames() { assertEquals( From 4857594be2a2ecb45ce06c836fc7ff952155b742 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Wed, 8 Nov 2023 16:20:59 -0600 Subject: [PATCH 19/21] Update AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java Co-authored-by: scannillo <35243507+scannillo@users.noreply.github.com> --- .../java/com/braintreepayments/api/AmericanExpressClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java index 2ac5e1570c..e02bf7584a 100644 --- a/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java +++ b/AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java @@ -36,7 +36,6 @@ public void getRewardsBalance(@NonNull String nonce, @NonNull String currencyIso .appendQueryParameter("currencyIsoCode", currencyIsoCode) .build() .toString(); - String analytis = AmericanExpressAnalytics.REWARDS_BALANCE_SUCCEEDED.event; braintreeClient.sendAnalyticsEvent("amex.rewards-balance.start"); braintreeClient.sendGET(getRewardsBalanceUrl, (responseBody, httpError) -> { From 196cc8d24a893cb11f8c801a0cd8f994202103ce Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Wed, 8 Nov 2023 16:22:15 -0600 Subject: [PATCH 20/21] Remove outdated event --- .../src/main/java/com/braintreepayments/api/VenmoAnalytics.kt | 1 - .../java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt index e0c72b55d6..8dd26de38b 100644 --- a/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt +++ b/Venmo/src/main/java/com/braintreepayments/api/VenmoAnalytics.kt @@ -9,7 +9,6 @@ internal enum class VenmoAnalytics(@JvmField val event: String) { APP_SWITCH_CANCELED("venmo:tokenize:app-switch:canceled"), // Additional Detail Events - TOKENIZE_NETWORK_CONNECTION_LOST("venmo:tokenize:network-connection:failed"), APP_SWITCH_SUCCEEDED("venmo:tokenize:app-switch:succeeded"), APP_SWITCH_FAILED("venmo:tokenize:app-switch:failed") } diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt index cac89aea46..81c9334c34 100644 --- a/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt +++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAnalyticsUnitTest.kt @@ -22,9 +22,5 @@ class VenmoAnalyticsUnitTest { assertEquals("venmo:tokenize:failed", VenmoAnalytics.TOKENIZE_FAILED.event) assertEquals("venmo:tokenize:started", VenmoAnalytics.TOKENIZE_STARTED.event) assertEquals("venmo:tokenize:succeeded", VenmoAnalytics.TOKENIZE_SUCCEEDED.event) - assertEquals( - "venmo:tokenize:network-connection:failed", - VenmoAnalytics.TOKENIZE_NETWORK_CONNECTION_LOST.event - ) } } From 1ddf5c49d46a05c95f47b6ff5d22f491fa519f20 Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Mon, 13 Nov 2023 10:14:46 -0600 Subject: [PATCH 21/21] Add doc string --- .../main/java/com/braintreepayments/api/GooglePayAnalytics.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt index bde26559ec..8957de60e7 100644 --- a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt +++ b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayAnalytics.kt @@ -2,10 +2,14 @@ package com.braintreepayments.api internal enum class GooglePayAnalytics(@JvmField val event: String) { + // Payment Request Events + PAYMENT_REQUEST_STARTED("google-pay:payment-request:started"), PAYMENT_REQUEST_FAILED("google-pay:payment-request:failed"), PAYMENT_REQUEST_SUCCEEDED("google-pay:payment-request:succeeded"), + // Tokenize Events + TOKENIZE_STARTED("google-pay:tokenize:started"), TOKENIZE_FAILED("google-pay:tokenize:failed"), TOKENIZE_SUCCEEDED("google-pay:tokenize:succeeded")