From 43b863b77891d8d25adc91fdc20306d92f3724ef Mon Sep 17 00:00:00 2001 From: malinajirka Date: Thu, 7 Nov 2024 09:46:46 +0100 Subject: [PATCH] Rename methods names for better clarity --- .../orders/creation/OrderCreateEditFormFragment.kt | 4 ++-- .../ui/orders/creation/OrderCreateEditViewModel.kt | 6 +++--- .../CreationFocusedOrderCreateEditViewModelTest.kt | 14 +++++++------- .../EditFocusedOrderCreateEditViewModelTest.kt | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt index 03bd4a79293..5367400db59 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt @@ -168,7 +168,7 @@ class OrderCreateEditFormFragment : handleCouponEditResult() handleProductDetailsEditResult() handleResult(KEY_COUPON_SELECTOR_RESULT) { - viewModel.onCouponAdded(it) + viewModel.addCoupon(it) } handleTaxRateSelectionResult() viewModel.onDeviceConfigurationChanged(requireContext().windowSizeClass) @@ -449,7 +449,7 @@ class OrderCreateEditFormFragment : isEnabled = couponSection.isEnabled, modifier = Modifier.padding(bottom = 1.dp), onAdd = { viewModel.onAddCouponButtonClicked() }, - onRemove = { code -> viewModel.onCouponRemoved(code) } + onRemove = { code -> viewModel.removeCoupon(code) } ) } } diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt index d6c16520507..d1cca81fda7 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt @@ -572,7 +572,7 @@ class OrderCreateEditViewModel @Inject constructor( private fun handleCouponEditResult(couponEditResult: OrderCreateCouponDetailsViewModel.CouponEditResult) { when (couponEditResult) { is OrderCreateCouponDetailsViewModel.CouponEditResult.RemoveCoupon -> { - onCouponRemoved(couponEditResult.couponCode) + removeCoupon(couponEditResult.couponCode) } } } @@ -1809,7 +1809,7 @@ class OrderCreateEditViewModel @Inject constructor( } } - fun onCouponAdded(couponCode: String) { + fun addCoupon(couponCode: String) { if (_orderDraft.value.couponLines.any { it.code == couponCode }) return _orderDraft.update { draft -> val couponLines = draft.couponLines @@ -1819,7 +1819,7 @@ class OrderCreateEditViewModel @Inject constructor( } } - fun onCouponRemoved(couponCode: String) { + fun removeCoupon(couponCode: String) { trackCouponRemoved() _orderDraft.update { draft -> val updatedCouponLines = draft.couponLines.filter { it.code != couponCode } diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/CreationFocusedOrderCreateEditViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/CreationFocusedOrderCreateEditViewModelTest.kt index 88f2b39e6d6..ba431ed7b88 100644 --- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/CreationFocusedOrderCreateEditViewModelTest.kt +++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/CreationFocusedOrderCreateEditViewModelTest.kt @@ -1223,7 +1223,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes initMocksForAnalyticsWithOrder(defaultOrderValue) createSut() - sut.onCouponAdded("abc") + sut.addCoupon("abc") verify(tracker).track( AnalyticsEvent.ORDER_COUPON_ADD, @@ -1266,7 +1266,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes lastReceivedEvent = it } - sut.onCouponAdded("abc") + sut.addCoupon("abc") with(lastReceivedEvent) { this == OnCouponRejectedByBackend @@ -1608,7 +1608,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes } assertThat(sut.couponLinesLiveData.value!!.couponLines).isEmpty() - sut.onCouponAdded(dummyCouponCode) + sut.addCoupon(dummyCouponCode) assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty } @@ -1621,10 +1621,10 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes } sut.couponLinesLiveData.observeForever { } - sut.onCouponAdded(dummyCouponCode) + sut.addCoupon(dummyCouponCode) assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty - sut.onCouponRemoved(dummyCouponCode) + sut.removeCoupon(dummyCouponCode) assertThat(sut.couponLinesLiveData.value!!.couponLines).isEmpty() } @@ -1639,7 +1639,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes } sut.couponLinesLiveData.observeForever { } - sut.onCouponAdded("123") + sut.addCoupon("123") advanceUntilIdle() assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty @@ -1658,7 +1658,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes } sut.couponLinesLiveData.observeForever { } - sut.onCouponAdded("123") + sut.addCoupon("123") advanceUntilIdle() assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty sut.onProductsSelected(listOf(ProductSelectorViewModel.SelectedItem.Product(1L))) diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/EditFocusedOrderCreateEditViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/EditFocusedOrderCreateEditViewModelTest.kt index c92de374618..8d000b2d35e 100644 --- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/EditFocusedOrderCreateEditViewModelTest.kt +++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/creation/EditFocusedOrderCreateEditViewModelTest.kt @@ -204,7 +204,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest() latestOrderDraft = it } - sut.onCouponAdded("new_code") + sut.addCoupon("new_code") latestOrderDraft!!.couponLines.filter { it.code == "new_code" }.apply { assertTrue(isNotEmpty()) @@ -222,7 +222,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest() latestOrderDraft = it } - sut.onCouponAdded("new_code") + sut.addCoupon("new_code") latestOrderDraft!!.couponLines.filter { it.code == "new_code" }.apply { assertTrue(isNotEmpty()) assertEquals(1, size) @@ -245,8 +245,8 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest() sut.orderDraft.observeForever { latestOrderDraft = it } - sut.onCouponAdded("new_code") - sut.onCouponAdded("new_code2") + sut.addCoupon("new_code") + sut.addCoupon("new_code2") // when sut.onCouponEditResult(OrderCreateCouponDetailsViewModel.CouponEditResult.RemoveCoupon("new_code")) @@ -284,7 +284,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest() sut.orderDraft.observeForever { orderDraft = it } - sut.onCouponAdded("new_code") + sut.addCoupon("new_code") // when sut.onCouponButtonClicked() @@ -666,7 +666,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest() initMocksForAnalyticsWithOrder(defaultOrderValue) createSut() - sut.onCouponAdded("code ") + sut.addCoupon("code ") verify(tracker).track( AnalyticsEvent.ORDER_COUPON_ADD,