Skip to content

Commit dab56c9

Browse files
ben-kaufmanben-kaufman
committed
Fix tests
1 parent 1c88564 commit dab56c9

File tree

2 files changed

+89
-22
lines changed

2 files changed

+89
-22
lines changed

‎app/src/main/java/to/bitkit/repositories/ActivityRepo.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ import javax.inject.Singleton
4343

4444
private const val SYNC_TIMEOUT_MS = 40_000L
4545

46-
@Suppress("LongParameterList")
4746
@Singleton
47+
@Suppress("LargeClass")
48+
@Suppress("LongParameterList")
4849
class ActivityRepo @Inject constructor(
4950
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
5051
private val coreService: CoreService,

‎app/src/test/java/to/bitkit/repositories/ActivityRepoTest.kt‎

Lines changed: 87 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import org.junit.Before
1212
import org.junit.Test
1313
import org.lightningdevkit.ldknode.PaymentDetails
1414
import org.mockito.kotlin.any
15+
import org.mockito.kotlin.anyOrNull
1516
import org.mockito.kotlin.argThat
1617
import org.mockito.kotlin.doReturn
18+
import org.mockito.kotlin.eq
1719
import org.mockito.kotlin.mock
1820
import org.mockito.kotlin.never
1921
import org.mockito.kotlin.verify
@@ -22,6 +24,7 @@ import org.mockito.kotlin.wheneverBlocking
2224
import to.bitkit.data.AppCacheData
2325
import to.bitkit.data.AppDb
2426
import to.bitkit.data.CacheStore
27+
import to.bitkit.data.dao.TagMetadataDao
2528
import to.bitkit.data.dto.PendingBoostActivity
2629
import to.bitkit.services.CoreService
2730
import to.bitkit.test.BaseUnitTest
@@ -139,26 +142,17 @@ class ActivityRepoTest : BaseUnitTest() {
139142
}
140143

141144
private fun setupSyncActivitiesMocks(
142-
cacheData: AppCacheData,
143-
activities: List<Activity> = emptyList()
145+
cacheData: AppCacheData
144146
) {
147+
val tagMetadataDao = mock<TagMetadataDao>()
148+
whenever(db.tagMetadataDao()).thenReturn(tagMetadataDao)
149+
wheneverBlocking { tagMetadataDao.getAll() }.thenReturn(emptyList())
150+
145151
whenever(cacheStore.data).thenReturn(flowOf(cacheData))
146152
wheneverBlocking { lightningRepo.getPayments() }.thenReturn(Result.success(emptyList()))
147153
wheneverBlocking { coreService.activity.syncLdkNodePaymentsToActivities(any(), eq(false)) }.thenReturn(Unit)
148-
if (activities.isNotEmpty()) {
149-
wheneverBlocking {
150-
coreService.activity.get(
151-
filter = ActivityFilter.ONCHAIN,
152-
txType = PaymentType.SENT,
153-
tags = null,
154-
search = null,
155-
minDate = null,
156-
maxDate = null,
157-
limit = 10u,
158-
sortDirection = null
159-
)
160-
}.thenReturn(activities)
161-
}
154+
wheneverBlocking { transferRepo.syncTransferStates() }.thenReturn(Result.success(Unit))
155+
wheneverBlocking { coreService.activity.allPossibleTags() }.thenReturn(emptyList())
162156
}
163157

164158
@Test
@@ -581,6 +575,18 @@ class ActivityRepoTest : BaseUnitTest() {
581575

582576
val cacheData = AppCacheData(activitiesPendingDelete = listOf(activityId))
583577
setupSyncActivitiesMocks(cacheData)
578+
wheneverBlocking {
579+
coreService.activity.get(
580+
filter = anyOrNull(),
581+
txType = anyOrNull(),
582+
tags = anyOrNull(),
583+
search = anyOrNull(),
584+
minDate = anyOrNull(),
585+
maxDate = anyOrNull(),
586+
limit = anyOrNull(),
587+
sortDirection = anyOrNull()
588+
)
589+
}.thenReturn(emptyList())
584590
wheneverBlocking { coreService.activity.getActivity(activityId) }.thenReturn(onchainActivity)
585591
wheneverBlocking { coreService.activity.update(eq(activityId), any()) }.thenReturn(Unit)
586592
wheneverBlocking { cacheStore.removeActivityFromPendingDelete(activityId) }.thenReturn(Unit)
@@ -623,7 +629,19 @@ class ActivityRepoTest : BaseUnitTest() {
623629
)
624630

625631
val cacheData = AppCacheData(pendingBoostActivities = listOf(pendingBoost))
626-
setupSyncActivitiesMocks(cacheData, listOf(existingActivity))
632+
setupSyncActivitiesMocks(cacheData)
633+
wheneverBlocking {
634+
coreService.activity.get(
635+
filter = eq(ActivityFilter.ONCHAIN),
636+
txType = eq(PaymentType.SENT),
637+
tags = anyOrNull(),
638+
search = anyOrNull(),
639+
minDate = anyOrNull(),
640+
maxDate = anyOrNull(),
641+
limit = eq(10u),
642+
sortDirection = anyOrNull()
643+
)
644+
}.thenReturn(listOf(existingActivity))
627645
wheneverBlocking { coreService.activity.update(eq(activityId), any()) }.thenReturn(Unit)
628646
wheneverBlocking { cacheStore.removeActivityFromPendingBoost(pendingBoost) }.thenReturn(Unit)
629647

@@ -663,7 +681,19 @@ class ActivityRepoTest : BaseUnitTest() {
663681
)
664682

665683
val cacheData = AppCacheData(pendingBoostActivities = listOf(pendingBoost))
666-
setupSyncActivitiesMocks(cacheData, listOf(existingActivity))
684+
setupSyncActivitiesMocks(cacheData)
685+
wheneverBlocking {
686+
coreService.activity.get(
687+
filter = eq(ActivityFilter.ONCHAIN),
688+
txType = eq(PaymentType.SENT),
689+
tags = anyOrNull(),
690+
search = anyOrNull(),
691+
minDate = anyOrNull(),
692+
maxDate = anyOrNull(),
693+
limit = eq(10u),
694+
sortDirection = anyOrNull()
695+
)
696+
}.thenReturn(listOf(existingActivity))
667697
wheneverBlocking { coreService.activity.update(eq(activityId), any()) }.thenReturn(Unit)
668698
wheneverBlocking { cacheStore.removeActivityFromPendingBoost(pendingBoost) }.thenReturn(Unit)
669699

@@ -703,7 +733,19 @@ class ActivityRepoTest : BaseUnitTest() {
703733
)
704734

705735
val cacheData = AppCacheData(pendingBoostActivities = listOf(pendingBoost))
706-
setupSyncActivitiesMocks(cacheData, listOf(existingActivity))
736+
setupSyncActivitiesMocks(cacheData)
737+
wheneverBlocking {
738+
coreService.activity.get(
739+
filter = eq(ActivityFilter.ONCHAIN),
740+
txType = eq(PaymentType.SENT),
741+
tags = anyOrNull(),
742+
search = anyOrNull(),
743+
minDate = anyOrNull(),
744+
maxDate = anyOrNull(),
745+
limit = eq(10u),
746+
sortDirection = anyOrNull()
747+
)
748+
}.thenReturn(listOf(existingActivity))
707749
wheneverBlocking { coreService.activity.update(eq(activityId), any()) }.thenReturn(Unit)
708750
wheneverBlocking { cacheStore.removeActivityFromPendingBoost(pendingBoost) }.thenReturn(Unit)
709751

@@ -752,7 +794,19 @@ class ActivityRepoTest : BaseUnitTest() {
752794
)
753795

754796
val cacheData = AppCacheData(pendingBoostActivities = listOf(pendingBoost))
755-
setupSyncActivitiesMocks(cacheData, listOf(existingActivity))
797+
setupSyncActivitiesMocks(cacheData)
798+
wheneverBlocking {
799+
coreService.activity.get(
800+
filter = eq(ActivityFilter.ONCHAIN),
801+
txType = eq(PaymentType.SENT),
802+
tags = anyOrNull(),
803+
search = anyOrNull(),
804+
minDate = anyOrNull(),
805+
maxDate = anyOrNull(),
806+
limit = eq(10u),
807+
sortDirection = anyOrNull()
808+
)
809+
}.thenReturn(listOf(existingActivity))
756810
wheneverBlocking { coreService.activity.update(eq(activityId), any()) }.thenReturn(Unit)
757811
wheneverBlocking { coreService.activity.getActivity(activityId) }.thenReturn(existingActivity)
758812
wheneverBlocking { coreService.activity.getActivity(activityToDeleteId) }.thenReturn(onchainActivityToDelete)
@@ -796,7 +850,19 @@ class ActivityRepoTest : BaseUnitTest() {
796850
)
797851

798852
val cacheData = AppCacheData(pendingBoostActivities = listOf(pendingBoost))
799-
setupSyncActivitiesMocks(cacheData, listOf(existingActivity))
853+
setupSyncActivitiesMocks(cacheData)
854+
wheneverBlocking {
855+
coreService.activity.get(
856+
filter = eq(ActivityFilter.ONCHAIN),
857+
txType = eq(PaymentType.SENT),
858+
tags = anyOrNull(),
859+
search = anyOrNull(),
860+
minDate = anyOrNull(),
861+
maxDate = anyOrNull(),
862+
limit = eq(10u),
863+
sortDirection = anyOrNull()
864+
)
865+
}.thenReturn(listOf(existingActivity))
800866
wheneverBlocking { cacheStore.removeActivityFromPendingBoost(pendingBoost) }.thenReturn(Unit)
801867

802868
val result = sut.syncActivities()

0 commit comments

Comments
 (0)