Use regular java test instead of connected tests

Author: janicduplessis

android/build.gradle

@@ -95,7 +95,6 @@ android {
     versionCode 1
     versionName "1.0"
     vectorDrawables.useSupportLibrary = true
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     consumerProguardFiles 'proguard-rules.txt'
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
@@ -131,6 +130,16 @@ android {
       }
     }
   }
+
+  // When running tests on bitrise we need to make sure that the test artifacts are inside
+  // the root project directory (in that case example/android), or it won't be picked up.
+  testOptions {
+    unitTests.all { Test test ->
+      def outputRoot = rootProject.layout.buildDirectory.get().asFile
+      test.reports.junitXml.outputLocation.set(new File(outputRoot, "test-results/${test.name}"))
+      test.reports.html.outputLocation.set(new File(outputRoot, "reports/tests/${test.name}"))
+    }
+  }
 }
 
 repositories {
@@ -229,10 +238,10 @@ dependencies {
   // Users need to declare this dependency on their own, otherwise all methods are a no-op
   compileOnly 'com.stripe:stripe-android-issuing-push-provisioning:1.1.0'
 
-  androidTestImplementation "junit:junit:4.13"
-  androidTestImplementation "androidx.test:core:1.4.0"
-  androidTestImplementation 'androidx.test:runner:1.1.0'
-  androidTestImplementation "org.mockito:mockito-core:3.+"
+  testImplementation "junit:junit:4.13"
+  testImplementation "org.mockito:mockito-core:3.+"
+  testImplementation "org.robolectric:robolectric:4.10"
+  testImplementation "androidx.test:core:1.4.0"
 
   implementation "androidx.compose.ui:ui:1.7.8"
   implementation "androidx.compose.foundation:foundation-layout:1.7.8"

android/src/main/java/com/reactnativestripesdk/FinancialConnectionsSheetManager.kt

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
@@ -105,7 +104,7 @@ class FinancialConnectionsSheetManager(
 
       is FinancialConnectionsSheetResult.Completed -> {
         promise?.resolve(
-          WritableNativeMap().also {
+          Arguments.createMap().also {
             it.putMap("session", mapFromSession(result.financialConnectionsSession))
           },
         )
@@ -115,13 +114,13 @@ class FinancialConnectionsSheetManager(
 
   companion object {
     private fun createTokenResult(result: FinancialConnectionsSheetForTokenResult.Completed): WritableMap =
-      WritableNativeMap().also {
+      Arguments.createMap().also {
         it.putMap("session", mapFromSession(result.financialConnectionsSession))
         it.putMap("token", mapFromToken(result.token))
       }
 
     private fun mapFromSession(financialConnectionsSession: FinancialConnectionsSession): WritableMap {
-      val session = WritableNativeMap()
+      val session = Arguments.createMap()
       session.putString("id", financialConnectionsSession.id)
       session.putString("clientSecret", financialConnectionsSession.clientSecret)
       session.putBoolean("livemode", financialConnectionsSession.livemode)
@@ -132,7 +131,7 @@ class FinancialConnectionsSheetManager(
     private fun mapFromAccountsList(accounts: FinancialConnectionsAccountList): ReadableArray {
       val results: WritableArray = Arguments.createArray()
       for (account in accounts.data) {
-        val map = WritableNativeMap()
+        val map = Arguments.createMap()
         map.putString("id", account.id)
         map.putBoolean("livemode", account.livemode)
         map.putString("displayName", account.displayName)
@@ -166,10 +165,10 @@ class FinancialConnectionsSheetManager(
       if (balance == null) {
         return null
       }
-      val map = WritableNativeMap()
+      val map = Arguments.createMap()
       map.putDouble("asOf", balance.asOf * 1000.0)
       map.putString("type", mapFromBalanceType(balance.type))
-      WritableNativeMap().also {
+      Arguments.createMap().also {
         for (entry in balance.current.entries) {
           it.putInt(entry.key, entry.value)
         }
@@ -181,9 +180,9 @@ class FinancialConnectionsSheetManager(
       return map
     }
 
-    private fun mapFromCashAvailable(balance: Balance): WritableNativeMap =
-      WritableNativeMap().also { cashMap ->
-        WritableNativeMap().also { availableMap ->
+    private fun mapFromCashAvailable(balance: Balance): WritableMap =
+      Arguments.createMap().also { cashMap ->
+        Arguments.createMap().also { availableMap ->
           balance.cash?.available?.entries?.let { entries ->
             for (entry in entries) {
               availableMap.putInt(entry.key, entry.value)
@@ -193,9 +192,9 @@ class FinancialConnectionsSheetManager(
         }
       }
 
-    private fun mapFromCreditUsed(balance: Balance): WritableNativeMap =
-      WritableNativeMap().also { creditMap ->
-        WritableNativeMap().also { usedMap ->
+    private fun mapFromCreditUsed(balance: Balance): WritableMap =
+      Arguments.createMap().also { creditMap ->
+        Arguments.createMap().also { usedMap ->
           balance.credit?.used?.entries?.let { entries ->
             for (entry in entries) {
               usedMap.putInt(entry.key, entry.value)
@@ -209,7 +208,7 @@ class FinancialConnectionsSheetManager(
       if (balanceRefresh == null) {
         return null
       }
-      val map = WritableNativeMap()
+      val map = Arguments.createMap()
       map.putString("status", mapFromBalanceRefreshStatus(balanceRefresh.status))
       map.putDouble("lastAttemptedAt", balanceRefresh.lastAttemptedAt * 1000.0)
       return map

android/src/main/java/com/reactnativestripesdk/GooglePayRequestHelper.kt

@@ -3,9 +3,9 @@ package com.reactnativestripesdk
 import android.app.Activity
 import android.content.Intent
 import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.google.android.gms.tasks.Task
 import com.google.android.gms.wallet.AutoResolveHelper
 import com.google.android.gms.wallet.PaymentData
@@ -165,7 +165,7 @@ class GooglePayRequestHelper {
       promise: Promise,
     ) {
       val paymentInformation = JSONObject(paymentData.toJson())
-      val promiseResult = WritableNativeMap()
+      val promiseResult = Arguments.createMap()
       stripe.createPaymentMethod(
         PaymentMethodCreateParams.createFromGooglePay(paymentInformation),
         callback =
@@ -193,7 +193,7 @@ class GooglePayRequestHelper {
     ) {
       val paymentInformation = JSONObject(paymentData.toJson())
       val googlePayResult = GooglePayResult.fromJson(paymentInformation)
-      val promiseResult = WritableNativeMap()
+      val promiseResult = Arguments.createMap()
       googlePayResult.token?.let {
         promiseResult.putMap("token", mapFromToken(it))
         if (googlePayResult.shippingInformation != null) {

android/src/main/java/com/reactnativestripesdk/PaymentSheetManager.kt

@@ -20,7 +20,6 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
@@ -145,7 +144,7 @@ class PaymentSheetManager(
           paymentOptionResult.paymentOption?.let {
             val bitmap = getBitmapFromDrawable(it.icon())
             val imageString = getBase64FromBitmap(bitmap)
-            val option: WritableMap = WritableNativeMap()
+            val option: WritableMap = Arguments.createMap()
             option.putString("label", it.label)
             option.putString("image", imageString)
             val additionalFields: Map<String, Any> = mapOf("didCancel" to paymentOptionResult.didCancel)
@@ -190,7 +189,7 @@ class PaymentSheetManager(
             }
 
             is PaymentSheetResult.Completed -> {
-              resolvePaymentResult(WritableNativeMap())
+              resolvePaymentResult(Arguments.createMap())
               paymentSheet = null
               flowController = null
             }
@@ -326,7 +325,7 @@ class PaymentSheetManager(
             .confirmCustomPaymentMethodCallback(this)
             .build(activity, signal)
         }
-      initPromise.resolve(WritableNativeMap())
+      initPromise.resolve(Arguments.createMap())
     }
   }
 
@@ -418,11 +417,11 @@ class PaymentSheetManager(
           flowController?.getPaymentOption()?.let {
             val bitmap = getBitmapFromDrawable(it.icon())
             val imageString = getBase64FromBitmap(bitmap)
-            val option: WritableMap = WritableNativeMap()
+            val option: WritableMap = Arguments.createMap()
             option.putString("label", it.label)
             option.putString("image", imageString)
             createResult("paymentOption", option)
-          } ?: run { WritableNativeMap() }
+          } ?: run { Arguments.createMap() }
         initPromise.resolve(result)
       }
 

android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt

@@ -18,7 +18,6 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
 import com.reactnativestripesdk.addresssheet.AddressLauncherManager
 import com.reactnativestripesdk.customersheet.CustomerSheetManager
@@ -502,7 +501,7 @@ class StripeSdkModule(
         object : ApiResultCallback<Token> {
           override fun onSuccess(result: Token) {
             val tokenId = result.id
-            val res = WritableNativeMap()
+            val res = Arguments.createMap()
             res.putString("tokenId", tokenId)
             promise.resolve(res)
           }
@@ -779,7 +778,7 @@ class StripeSdkModule(
                   expand = listOf("payment_method"),
                   object : ApiResultCallback<PaymentIntent> {
                     override fun onError(e: Exception) {
-                      promise.resolve(createResult("paymentIntent", WritableNativeMap()))
+                      promise.resolve(createResult("paymentIntent", Arguments.createMap()))
                     }
 
                     override fun onSuccess(result: PaymentIntent) {
@@ -799,7 +798,7 @@ class StripeSdkModule(
                   expand = listOf("payment_method"),
                   object : ApiResultCallback<SetupIntent> {
                     override fun onError(e: Exception) {
-                      promise.resolve(createResult("setupIntent", WritableNativeMap()))
+                      promise.resolve(createResult("setupIntent", Arguments.createMap()))
                     }
 
                     override fun onSuccess(result: SetupIntent) {
@@ -909,7 +908,7 @@ class StripeSdkModule(
       PushProvisioningProxy.isCardInWallet(it, last4) { isCardInWallet, token, error ->
         val result: WritableMap =
           error ?: run {
-            val map = WritableNativeMap()
+            val map = Arguments.createMap()
             map.putBoolean("isInWallet", isCardInWallet)
             map.putMap("token", token)
             map

android/src/main/java/com/reactnativestripesdk/addresssheet/AddressSheetView.kt

@@ -3,9 +3,9 @@ package com.reactnativestripesdk.addresssheet
 import android.annotation.SuppressLint
 import android.util.Log
 import android.widget.FrameLayout
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.reactnativestripesdk.buildPaymentSheetAppearance
@@ -172,14 +172,14 @@ class AddressSheetView(
     }
 
     internal fun buildResult(addressDetails: AddressDetails): WritableMap =
-      WritableNativeMap().apply {
+      Arguments.createMap().apply {
         putMap(
           "result",
-          WritableNativeMap().apply {
+          Arguments.createMap().apply {
             putString("name", addressDetails.name)
             putMap(
               "address",
-              WritableNativeMap().apply {
+              Arguments.createMap().apply {
                 putString("city", addressDetails.address?.city)
                 putString("country", addressDetails.address?.country)
                 putString("line1", addressDetails.address?.line1)

android/src/main/java/com/reactnativestripesdk/customersheet/CustomerSheetManager.kt

@@ -12,7 +12,6 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.ReactNativeCustomerAdapter
 import com.reactnativestripesdk.ReactNativeCustomerSessionProvider
 import com.reactnativestripesdk.buildBillingDetails
@@ -157,7 +156,7 @@ class CustomerSheetManager(
 
     customerSheet?.configure(configuration.build())
 
-    initPromise.resolve(WritableNativeMap())
+    initPromise.resolve(Arguments.createMap())
   }
 
   private fun handleResult(result: CustomerSheetResult) {

android/src/main/java/com/reactnativestripesdk/pushprovisioning/TapAndPayProxy.kt

@@ -2,9 +2,9 @@ package com.reactnativestripesdk.pushprovisioning
 
 import android.app.Activity
 import android.util.Log
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.google.android.gms.tasks.Task
 import com.reactnativestripesdk.utils.createError
 
@@ -108,7 +108,7 @@ object TapAndPayProxy {
   }
 
   private fun mapFromTokenInfo(token: Any?): WritableMap {
-    val result = WritableNativeMap()
+    val result = Arguments.createMap()
     token?.let {
       try {
         val tokenInfoClass = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo")

android/src/main/java/com/reactnativestripesdk/utils/Errors.kt

@@ -1,7 +1,7 @@
 package com.reactnativestripesdk.utils
 
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.stripe.android.core.exception.APIException
 import com.stripe.android.core.exception.AuthenticationException
 import com.stripe.android.core.exception.InvalidRequestException
@@ -66,8 +66,8 @@ internal fun mapError(
   type: String?,
   stripeErrorCode: String?,
 ): WritableMap {
-  val map: WritableMap = WritableNativeMap()
-  val details: WritableMap = WritableNativeMap()
+  val map: WritableMap = Arguments.createMap()
+  val details: WritableMap = Arguments.createMap()
   details.putString("code", code)
   details.putString("message", message)
   details.putString("localizedMessage", localizedMessage)