Fix PaymentOptionsAddPaymentMethodFragmentTest

paymentsheet/src/main/java/com/stripe/android/paymentsheet/BaseAddPaymentMethodFragment.kt

@@ -144,11 +144,11 @@ internal abstract class BaseAddPaymentMethodFragment : Fragment() {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 val processing by sheetViewModel.processing
-                        .asFlow()
-                        .collectAsState(initial = false)
+                    .asFlow()
+                    .collectAsState(initial = false)
                 val selectedItem by sheetViewModel.getAddFragmentSelectedLpm()
-                        .asFlow()
-                        .collectAsState(initial = initialSelectedItem)
+                    .asFlow()
+                    .collectAsState(initial = initialSelectedItem)
                 PaymentMethodsUI(
                     selectedIndex = paymentMethods.indexOf(selectedItem),
                     isEnabled = !processing,

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentOptionsAddPaymentMethodFragmentTest.kt

@@ -1,7 +1,8 @@
 package com.stripe.android.paymentsheet
 
-import android.app.Application
+import android.content.Context
 import androidx.core.os.bundleOf
+import androidx.fragment.app.testing.FragmentScenario
 import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.test.core.app.ApplicationProvider
 import com.google.common.truth.Truth.assertThat
@@ -13,9 +14,11 @@ import com.stripe.android.model.PaymentIntentFixtures
 import com.stripe.android.paymentsheet.databinding.FragmentPaymentsheetAddPaymentMethodBinding
 import com.stripe.android.paymentsheet.model.FragmentConfig
 import com.stripe.android.paymentsheet.model.FragmentConfigFixtures
+import com.stripe.android.ui.core.forms.resources.LpmRepository
 import com.stripe.android.utils.TestUtils
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -26,6 +29,8 @@ import org.robolectric.RobolectricTestRunner
 @ExperimentalCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 internal class PaymentOptionsAddPaymentMethodFragmentTest : PaymentOptionsViewModelTestInjection() {
+    private val context: Context = ApplicationProvider.getApplicationContext()
+    private val lpmRepository = LpmRepository(context.resources)
 
     @Before
     fun setup() {
@@ -43,52 +48,13 @@ internal class PaymentOptionsAddPaymentMethodFragmentTest : PaymentOptionsViewMo
     @Test
     fun `Factory gets initialized by Injector when Injector is available`() {
         createFragment { fragment, _, viewModel ->
-            val factory = PaymentOptionsViewModel.Factory(
-                { ApplicationProvider.getApplicationContext() },
-                {
-                    PaymentOptionContract.Args(
-                        PaymentIntentFixtures.PI_REQUIRES_PAYMENT_METHOD,
-                        emptyList(),
-                        null,
-                        false,
-                        null,
-                        null,
-                        DUMMY_INJECTOR_KEY,
-                        false,
-                        mock()
-                    )
-                },
-                fragment
-            )
             assertThat(fragment.sheetViewModel).isEqualTo(viewModel)
-
-            WeakMapInjectorRegistry.clear()
         }
     }
 
     @Test
-    fun `Factory gets initialized with fallback when no Injector is available`() = runBlockingTest {
+    fun `Factory gets initialized with fallback when no Injector is available`() = runTest(UnconfinedTestDispatcher()) {
         createFragment(registerInjector = false) { fragment, _, viewModel ->
-            val context = ApplicationProvider.getApplicationContext<Application>()
-            val productUsage = setOf("TestProductUsage")
-            PaymentConfiguration.init(context, "testKey")
-            val factory = PaymentOptionsViewModel.Factory(
-                { context },
-                {
-                    PaymentOptionContract.Args(
-                        PaymentIntentFixtures.PI_REQUIRES_PAYMENT_METHOD,
-                        emptyList(),
-                        null,
-                        false,
-                        null,
-                        null,
-                        DUMMY_INJECTOR_KEY,
-                        false,
-                        productUsage
-                    )
-                },
-                fragment
-            )
             assertThat(fragment.sheetViewModel).isNotEqualTo(viewModel)
         }
     }
@@ -108,7 +74,7 @@ internal class PaymentOptionsAddPaymentMethodFragmentTest : PaymentOptionsViewMo
         fragmentConfig: FragmentConfig? = FragmentConfigFixtures.DEFAULT,
         registerInjector: Boolean = true,
         onReady: (PaymentOptionsAddPaymentMethodFragment, FragmentPaymentsheetAddPaymentMethodBinding, PaymentOptionsViewModel) -> Unit
-    ) {
+    ): FragmentScenario<PaymentOptionsAddPaymentMethodFragment> {
         assertThat(WeakMapInjectorRegistry.staticCacheMap.size).isEqualTo(0)
         val viewModel = createViewModel(
             paymentMethods = args.paymentMethods,
@@ -117,10 +83,11 @@ internal class PaymentOptionsAddPaymentMethodFragmentTest : PaymentOptionsViewMo
         )
         viewModel.setStripeIntent(args.stripeIntent)
         TestUtils.idleLooper()
+
         if (registerInjector) {
-            registerViewModel(args.injectorKey, viewModel, createFormViewModel())
+            registerViewModel(args.injectorKey, viewModel, lpmRepository)
         }
-        launchFragmentInContainer<PaymentOptionsAddPaymentMethodFragment>(
+        return launchFragmentInContainer<PaymentOptionsAddPaymentMethodFragment>(
             bundleOf(
                 PaymentOptionsActivity.EXTRA_FRAGMENT_CONFIG to fragmentConfig,
                 PaymentOptionsActivity.EXTRA_STARTER_ARGS to args

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentOptionsViewModelTestInjection.kt

@@ -1,5 +1,6 @@
 package com.stripe.android.paymentsheet
 
+import android.app.Application
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.SavedStateHandle
 import androidx.test.core.app.ApplicationProvider
@@ -17,6 +18,7 @@ import com.stripe.android.paymentsheet.viewmodels.BaseSheetViewModel
 import com.stripe.android.ui.core.forms.resources.LpmRepository
 import com.stripe.android.ui.core.forms.resources.StaticResourceRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import org.junit.After
@@ -48,9 +50,6 @@ internal open class PaymentOptionsViewModelTestInjection {
         @InjectorKey injectorKey: String,
         args: PaymentOptionContract.Args = PaymentSheetFixtures.PAYMENT_OPTIONS_CONTRACT_ARGS
     ): PaymentOptionsViewModel = runBlocking {
-        val lpmRepository = mock<LpmRepository>()
-        whenever(lpmRepository.fromCode("card")).thenReturn(LpmRepository.HardcodedCard)
-
         PaymentOptionsViewModel(
             args,
             prefsRepositoryFactory = {
@@ -62,28 +61,28 @@ internal open class PaymentOptionsViewModelTestInjection {
             application = ApplicationProvider.getApplicationContext(),
             logger = Logger.noop(),
             injectorKey = injectorKey,
-            resourceRepository = StaticResourceRepository(mock(), lpmRepository),
+            resourceRepository = StaticResourceRepository(
+                mock(),
+                LpmRepository(ApplicationProvider.getApplicationContext<Application>().resources)
+            ),
             savedStateHandle = SavedStateHandle().apply {
                 set(BaseSheetViewModel.SAVE_RESOURCE_REPOSITORY_READY, true)
             },
             linkPaymentLauncherFactory = mock()
         )
     }
 
-    @ExperimentalCoroutinesApi
-    fun createFormViewModel(): FormViewModel = runBlocking {
-        FormViewModel(
-            paymentMethodCode = "",
-            config = mock(),
-            resourceRepository = mock(),
-            transformSpecToElement = mock()
-        )
-    }
-
+    @FlowPreview
     fun registerViewModel(
         @InjectorKey injectorKey: String,
         viewModel: PaymentOptionsViewModel,
-        formViewModel: FormViewModel
+        lpmRepository: LpmRepository = mock(),
+        formViewModel: FormViewModel = FormViewModel(
+            paymentMethodCode = PaymentMethod.Type.Card.code,
+            config = mock(),
+            resourceRepository = StaticResourceRepository(mock(), lpmRepository),
+            transformSpecToElement = mock()
+        )
     ) {
         val mockBuilder = mock<PaymentOptionsViewModelSubcomponent.Builder>()
         val mockSubcomponent = mock<PaymentOptionsViewModelSubcomponent>()