Skip to content

Commit 6099787

Browse files
committed
Remove tests related to My Site Dashboard default tab experiment.
1 parent c3e0c83 commit 6099787

3 files changed

Lines changed: 3 additions & 63 deletions

File tree

WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModelTest.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.wordpress.android.ui.accounts
22

3-
import com.nhaarman.mockitokotlin2.atLeastOnce
4-
import com.nhaarman.mockitokotlin2.verify
53
import com.nhaarman.mockitokotlin2.whenever
64
import org.assertj.core.api.Assertions.assertThat
75
import org.junit.Before
@@ -10,7 +8,6 @@ import org.junit.Test
108
import org.mockito.Mock
119
import org.wordpress.android.BaseUnitTest
1210
import org.wordpress.android.fluxc.store.SiteStore
13-
import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
1411
import org.wordpress.android.ui.prefs.AppPrefsWrapper
1512
import org.wordpress.android.util.BuildConfigWrapper
1613

@@ -20,11 +17,10 @@ class LoginEpilogueViewModelTest : BaseUnitTest() {
2017
@Mock lateinit var appPrefsWrapper: AppPrefsWrapper
2118
@Mock lateinit var buildConfigWrapper: BuildConfigWrapper
2219
@Mock lateinit var siteStore: SiteStore
23-
@Mock lateinit var mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
2420

2521
@Before
2622
fun setUp() {
27-
viewModel = LoginEpilogueViewModel(appPrefsWrapper, buildConfigWrapper, siteStore, mySiteDefaultTabExperiment)
23+
viewModel = LoginEpilogueViewModel(appPrefsWrapper, buildConfigWrapper, siteStore)
2824
}
2925

3026
@Test
@@ -260,13 +256,6 @@ class LoginEpilogueViewModelTest : BaseUnitTest() {
260256
assertThat(navigationEvents.last()).isInstanceOf(LoginNavigationEvents.ShowNoJetpackSites::class.java)
261257
}
262258

263-
@Test
264-
fun `given my site default tab experiment, when requested, then check and set for variant is executed `() {
265-
viewModel.checkAndSetVariantForMySiteDefaultTabExperiment()
266-
267-
verify(mySiteDefaultTabExperiment, atLeastOnce()).checkAndSetVariantIfNeeded()
268-
}
269-
270259
private data class Observers(val navigationEvents: List<LoginNavigationEvents>)
271260

272261
private fun initObservers(): Observers {

WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/CardsBuilderTest.kt

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.wordpress.android.ui.mysite.cards.quickactions.QuickActionsCardBuilde
3232
import org.wordpress.android.ui.mysite.cards.quicklinksribbon.QuickLinkRibbonBuilder
3333
import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartCardBuilder
3434
import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository.QuickStartCategory
35-
import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
3635
import org.wordpress.android.ui.quickstart.QuickStartTaskDetails
3736
import org.wordpress.android.ui.utils.UiString.UiStringText
3837
import org.wordpress.android.util.BuildConfigWrapper
@@ -48,7 +47,6 @@ class CardsBuilderTest {
4847
@Mock lateinit var dashboardCardsBuilder: DashboardCardsBuilder
4948
@Mock lateinit var quickLinkRibbonBuilder: QuickLinkRibbonBuilder
5049
@Mock lateinit var site: SiteModel
51-
@Mock lateinit var mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
5250

5351
private lateinit var cardsBuilder: CardsBuilder
5452
private val quickStartCategory: QuickStartCategory
@@ -98,35 +96,6 @@ class CardsBuilderTest {
9896
assertThat(cards.findQuickActionsCard()).isNull()
9997
}
10098

101-
@Test
102-
fun `given tabs enabled + experiment not running, when cards built, then quick actions card is built`() {
103-
val cards = buildCards(isMySiteTabsEnabled = true, isDefaultTabExperimentRunning = false)
104-
105-
assertThat(cards.findQuickActionsCard()).isNotNull
106-
}
107-
108-
@Test
109-
fun `given tabs enabled + experiment running + variant not assigned, when cards built, then quick actions built`() {
110-
val cards = buildCards(
111-
isMySiteTabsEnabled = true,
112-
isDefaultTabExperimentRunning = true,
113-
isDefaultTabVariantAssigned = false
114-
)
115-
116-
assertThat(cards.findQuickActionsCard()).isNotNull
117-
}
118-
119-
@Test
120-
fun `given tabs enabled + experiment running + variant assigned, when cards built, then quick actions not built`() {
121-
val cards = buildCards(
122-
isMySiteTabsEnabled = true,
123-
isDefaultTabExperimentRunning = true,
124-
isDefaultTabVariantAssigned = true
125-
)
126-
127-
assertThat(cards.findQuickActionsCard()).isNull()
128-
}
129-
13099
/* QUICK START CARD */
131100

132101
@Test
@@ -194,14 +163,10 @@ class CardsBuilderTest {
194163
isDomainCreditAvailable: Boolean = false,
195164
isQuickStartInProgress: Boolean = false,
196165
isQuickStartDynamicCardEnabled: Boolean = false,
197-
isMySiteTabsEnabled: Boolean = false,
198-
isDefaultTabExperimentRunning: Boolean = false,
199-
isDefaultTabVariantAssigned: Boolean = false
166+
isMySiteTabsEnabled: Boolean = false
200167
): List<MySiteCardAndItem> {
201168
whenever(buildConfigWrapper.isQuickActionEnabled).thenReturn(isQuickActionEnabled)
202169
whenever(quickStartDynamicCardsFeatureConfig.isEnabled()).thenReturn(isQuickStartDynamicCardEnabled)
203-
whenever(mySiteDefaultTabExperiment.isExperimentRunning()).thenReturn(isDefaultTabExperimentRunning)
204-
whenever(mySiteDefaultTabExperiment.isVariantAssigned()).thenReturn(isDefaultTabVariantAssigned)
205170
return cardsBuilder.build(
206171
quickActionsCardBuilderParams = QuickActionsCardBuilderParams(
207172
siteModel = site,
@@ -270,8 +235,7 @@ class CardsBuilderTest {
270235
quickActionsCardBuilder,
271236
quickStartCardBuilder,
272237
quickLinkRibbonBuilder,
273-
dashboardCardsBuilder,
274-
mySiteDefaultTabExperiment
238+
dashboardCardsBuilder
275239
)
276240
}
277241

WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.lifecycle.MutableLiveData
44
import androidx.lifecycle.Observer
55
import com.nhaarman.mockitokotlin2.any
66
import com.nhaarman.mockitokotlin2.anyOrNull
7-
import com.nhaarman.mockitokotlin2.atLeastOnce
87
import com.nhaarman.mockitokotlin2.eq
98
import com.nhaarman.mockitokotlin2.mock
109
import com.nhaarman.mockitokotlin2.never
@@ -48,7 +47,6 @@ import org.wordpress.android.ui.main.MainActionListItem.CreateAction
4847
import org.wordpress.android.ui.main.MainFabUiState
4948
import org.wordpress.android.ui.mysite.SelectedSiteRepository
5049
import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository
51-
import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
5250
import org.wordpress.android.ui.prefs.AppPrefsWrapper
5351
import org.wordpress.android.ui.quickstart.QuickStartType
5452
import org.wordpress.android.ui.whatsnew.FeatureAnnouncement
@@ -79,7 +77,6 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
7977
@Mock lateinit var selectedSiteRepository: SelectedSiteRepository
8078
@Mock lateinit var accountStore: AccountStore
8179
@Mock lateinit var siteStore: SiteStore
82-
@Mock lateinit var mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
8380
@Mock lateinit var bloggingPromptsFeatureConfig: BloggingPromptsFeatureConfig
8481
@Mock lateinit var bloggingPromptsStore: BloggingPromptsStore
8582
@Mock lateinit var quickStartType: QuickStartType
@@ -142,7 +139,6 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
142139
selectedSiteRepository,
143140
accountStore,
144141
siteStore,
145-
mySiteDefaultTabExperiment,
146142
bloggingPromptsFeatureConfig,
147143
bloggingPromptsStore,
148144
NoDelayCoroutineDispatcher()
@@ -801,15 +797,6 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
801797
assertThat(viewModel.firstSite).isEqualTo(null)
802798
}
803799

804-
@Test
805-
fun `given my site default tab experiment, when requested, then check and set for variant is executed `() {
806-
startViewModelWithDefaultParameters()
807-
808-
viewModel.checkAndSetVariantForMySiteDefaultTabExperiment()
809-
810-
verify(mySiteDefaultTabExperiment, atLeastOnce()).checkAndSetVariantIfNeeded()
811-
}
812-
813800
@Test
814801
fun `Should track analytics event when onHelpPrompActionClicked is called`() {
815802
whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(true)

0 commit comments

Comments
 (0)