Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

Commit 3f88c50

Browse files
Fix unit tests
1 parent c0b9ae6 commit 3f88c50

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/di/WCDatabaseModule.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import dagger.Binds
55
import dagger.Module
66
import dagger.Provides
77
import org.wordpress.android.fluxc.module.DatabaseModule
8+
import org.wordpress.android.fluxc.persistence.OrderSqlUtils
89
import org.wordpress.android.fluxc.persistence.TransactionExecutor
910
import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
1011
import org.wordpress.android.fluxc.persistence.dao.AddonsDao
1112
import org.wordpress.android.fluxc.persistence.dao.CouponsDao
1213
import org.wordpress.android.fluxc.persistence.dao.OrdersDao
14+
import javax.inject.Inject
1315
import javax.inject.Singleton
1416

1517
@Module(
@@ -49,6 +51,11 @@ interface WCDatabaseModule {
4951

5052
@Provides fun provideWooPaymentsDepositsOverviewDao(database: WCAndroidDatabase) =
5153
database.wooPaymentsDepositsOverviewDao
54+
55+
/**
56+
* OrderSqlUtils is a Kotlin object, we can't use [Inject] to inject it.
57+
*/
58+
@Provides fun provideOrderSqlUtils() = OrderSqlUtils
5259
}
5360
@Binds fun bindTransactionExecutor(database: WCAndroidDatabase): TransactionExecutor
5461
}

plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/OrderUpdateStore.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ class OrderUpdateStore @Inject internal constructor(
3838
private val coroutineEngine: CoroutineEngine,
3939
private val wcOrderRestClient: OrderRestClient,
4040
private val ordersDaoDecorator: OrdersDaoDecorator,
41-
private val siteSqlUtils: SiteSqlUtils
41+
private val siteSqlUtils: SiteSqlUtils,
42+
private val orderSqlUtils: OrderSqlUtils
4243
) {
4344
suspend fun updateCustomerOrderNote(
4445
orderId: Long,
@@ -277,7 +278,7 @@ class OrderUpdateStore @Inject internal constructor(
277278
WooResult(result.error)
278279
} else {
279280
ordersDaoDecorator.deleteOrder(site.localId(), orderId)
280-
OrderSqlUtils.deleteOrderSummaryById(site, orderId)
281+
orderSqlUtils.deleteOrderSummaryById(site, orderId)
281282
WooResult(Unit)
282283
}
283284
}

plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/store/OrderUpdateStoreTest.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
2525
import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto.Billing
2626
import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto.Shipping
2727
import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient
28+
import org.wordpress.android.fluxc.persistence.OrderSqlUtils
2829
import org.wordpress.android.fluxc.persistence.SiteSqlUtils
2930
import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
3031
import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderChanged
@@ -45,6 +46,7 @@ class OrderUpdateStoreTest {
4546
private val siteSqlUtils: SiteSqlUtils = mock {
4647
on { getSiteWithLocalId(any()) } doReturn site
4748
}
49+
private val orderSqlUtils: OrderSqlUtils = mock()
4850
private val ordersDaoDecorator: OrdersDaoDecorator = mock {
4951
onBlocking { getOrder(TEST_REMOTE_ORDER_ID, TEST_LOCAL_SITE_ID) } doReturn initialOrder
5052
}
@@ -56,9 +58,10 @@ class OrderUpdateStoreTest {
5658
TestCoroutineScope().coroutineContext,
5759
mock()
5860
),
59-
orderRestClient,
60-
ordersDaoDecorator,
61-
siteSqlUtils
61+
wcOrderRestClient = orderRestClient,
62+
ordersDaoDecorator = ordersDaoDecorator,
63+
siteSqlUtils = siteSqlUtils,
64+
orderSqlUtils = orderSqlUtils
6265
)
6366
}
6467

@@ -518,6 +521,7 @@ class OrderUpdateStoreTest {
518521
)
519522

520523
verify(ordersDaoDecorator).deleteOrder(site.localId(), TEST_REMOTE_ORDER_ID)
524+
verify(orderSqlUtils).deleteOrderSummaryById(site, TEST_REMOTE_ORDER_ID)
521525
}
522526

523527
private companion object {

0 commit comments

Comments
 (0)