From b85ada930bdfce0cd5059eabf03037f369994ca1 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Thu, 28 Mar 2024 09:13:05 +0100 Subject: [PATCH] fix warnings in test runs (#4340) Found while working on #4026 but not directly related. Two cases of unmocked methods and one of unclosed resource. --- .../test/java/com/keylesspalace/tusky/MainActivityTest.kt | 6 ++++++ .../tusky/components/compose/ComposeActivityTest.kt | 5 +++++ .../tusky/components/viewthread/ViewThreadViewModelTest.kt | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt index 6770e08d6..97b2a9c70 100644 --- a/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt @@ -18,6 +18,7 @@ import com.keylesspalace.tusky.entity.Notification import com.keylesspalace.tusky.entity.TimelineAccount import java.util.Date import kotlinx.coroutines.test.TestScope +import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Before @@ -60,6 +61,11 @@ class MainActivityTest { WorkManagerTestInitHelper.initializeTestWorkManager(context) } + @After + fun teardown() { + WorkManagerTestInitHelper.closeWorkDatabase() + } + @Test fun `clicking notification of type FOLLOW shows notification tab`() { val intent = showNotification(Notification.Type.FOLLOW) diff --git a/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeActivityTest.kt index 26597f596..1c29d57aa 100644 --- a/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeActivityTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeActivityTest.kt @@ -35,6 +35,7 @@ import com.keylesspalace.tusky.di.ViewModelFactory import com.keylesspalace.tusky.entity.Instance import com.keylesspalace.tusky.entity.InstanceConfiguration import com.keylesspalace.tusky.entity.InstanceV1 +import com.keylesspalace.tusky.entity.SearchResult import com.keylesspalace.tusky.entity.StatusConfiguration import com.keylesspalace.tusky.network.MastodonApi import java.util.Locale @@ -49,6 +50,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.doReturn import org.mockito.kotlin.eq import org.mockito.kotlin.mock @@ -123,6 +125,9 @@ class ComposeActivityTest { NetworkResult.success(instance) } } + onBlocking { search(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) } doReturn NetworkResult.success( + SearchResult(emptyList(), emptyList(), emptyList()) + ) } val instanceDaoMock: InstanceDao = mock { diff --git a/app/src/test/java/com/keylesspalace/tusky/components/viewthread/ViewThreadViewModelTest.kt b/app/src/test/java/com/keylesspalace/tusky/components/viewthread/ViewThreadViewModelTest.kt index 55b57b3b5..f1548ef48 100644 --- a/app/src/test/java/com/keylesspalace/tusky/components/viewthread/ViewThreadViewModelTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/components/viewthread/ViewThreadViewModelTest.kt @@ -77,7 +77,9 @@ class ViewThreadViewModelTest { fun setup() { shadowOf(getMainLooper()).idle() - api = mock() + api = mock { + onBlocking { getFilters() } doReturn NetworkResult.success(emptyList()) + } eventHub = EventHub() val filterModel = FilterModel() val timelineCases = TimelineCases(api, eventHub)