Skip to content

Commit daa3698

Browse files
committed
Fix import placement and drop a no-op suppression
Move the `uniffi.wp_api` imports out of the middle of the `org.wordpress.android` block, and remove `@Suppress("UNCHECKED_CAST")` from a test that has no cast.
1 parent bd8d6b8 commit daa3698

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_REDEM
1313
import org.wordpress.android.fluxc.model.PlanModel
1414
import org.wordpress.android.fluxc.model.SiteModel
1515
import org.wordpress.android.fluxc.network.rest.wpcom.site.Domain
16-
import uniffi.wp_api.AllDomainItem
17-
import uniffi.wp_api.DomainListItemStatusType
1816
import org.wordpress.android.fluxc.store.SiteStore
1917
import org.wordpress.android.modules.BG_THREAD
2018
import org.wordpress.android.ui.domains.DomainsDashboardItem.AddDomain
@@ -44,6 +42,8 @@ import org.wordpress.android.util.UrlUtils
4442
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
4543
import org.wordpress.android.viewmodel.Event
4644
import org.wordpress.android.viewmodel.ScopedViewModel
45+
import uniffi.wp_api.AllDomainItem
46+
import uniffi.wp_api.DomainListItemStatusType
4747
import javax.inject.Inject
4848
import javax.inject.Named
4949

WordPress/src/test/java/org/wordpress/android/ui/domains/DomainsDashboardViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.wordpress.android.R
1111
import org.wordpress.android.fluxc.model.PlanModel
1212
import org.wordpress.android.fluxc.model.SiteModel
1313
import org.wordpress.android.fluxc.network.rest.wpcom.site.Domain
14-
import org.wordpress.android.ui.domains.management.testDomainItem
1514
import org.wordpress.android.fluxc.store.SiteStore
1615
import org.wordpress.android.fluxc.store.SiteStore.FetchedDomainsPayload
1716
import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched
@@ -20,6 +19,7 @@ import org.wordpress.android.ui.domains.DomainsDashboardItem.PurchaseDomain
2019
import org.wordpress.android.ui.domains.DomainsDashboardItem.PurchasePlan
2120
import org.wordpress.android.ui.domains.DomainsDashboardItem.SiteDomains
2221
import org.wordpress.android.ui.domains.DomainsDashboardItem.SiteDomainsHeader
22+
import org.wordpress.android.ui.domains.management.testDomainItem
2323
import org.wordpress.android.ui.domains.usecases.AllDomains
2424
import org.wordpress.android.ui.domains.usecases.FetchAllDomainsUseCase
2525
import org.wordpress.android.ui.domains.usecases.FetchPlansUseCase

WordPress/src/test/java/org/wordpress/android/ui/domains/FetchAllDomainsUseCaseTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class FetchAllDomainsUseCaseTest : BaseUnitTest() {
6969
}
7070
}
7171

72-
@Suppress("UNCHECKED_CAST")
7372
@Test
7473
fun `given all-domains returns error, when execute, returns error`() =
7574
test {

0 commit comments

Comments
 (0)