Skip to content

Commit 4396167

Browse files
authored
Feature/remove closed experiments (#345)
* Remove onboarding as an experimental feature * Remove variants which have ended
1 parent 89d49d4 commit 4396167

20 files changed

+7
-938
lines changed

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ import com.duckduckgo.app.browser.BrowserTabViewModel.Command.DisplayMessage
3232
import com.duckduckgo.app.browser.BrowserTabViewModel.Command.Navigate
3333
import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.DownloadFile
3434
import com.duckduckgo.app.browser.LongPressHandler.RequiredAction.OpenInNewTab
35-
import com.duckduckgo.app.browser.defaultBrowsing.DefaultBrowserDetector
36-
import com.duckduckgo.app.browser.defaultBrowsing.DefaultBrowserNotification
3735
import com.duckduckgo.app.browser.favicon.FaviconDownloader
3836
import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
3937
import com.duckduckgo.app.browser.session.WebViewSessionStorage
@@ -47,7 +45,6 @@ import com.duckduckgo.app.privacy.db.SiteVisitedEntity
4745
import com.duckduckgo.app.privacy.model.PrivacyGrade
4846
import com.duckduckgo.app.privacy.store.TermsOfServiceStore
4947
import com.duckduckgo.app.settings.db.SettingsDataStore
50-
import com.duckduckgo.app.statistics.VariantManager
5148
import com.duckduckgo.app.statistics.api.StatisticsUpdater
5249
import com.duckduckgo.app.tabs.model.TabRepository
5350
import com.duckduckgo.app.trackerdetection.model.TrackerNetwork
@@ -104,21 +101,12 @@ class BrowserTabViewModelTest {
104101
@Mock
105102
private lateinit var mockOmnibarConverter: OmnibarEntryConverter
106103

107-
@Mock
108-
private lateinit var mockDefaultBrowserDetector: DefaultBrowserDetector
109-
110-
@Mock
111-
private lateinit var mockDefaultBrowserNotification: DefaultBrowserNotification
112-
113104
@Mock
114105
private lateinit var mockTabsRepository: TabRepository
115106

116107
@Mock
117108
private lateinit var webViewSessionStorage: WebViewSessionStorage
118109

119-
@Mock
120-
private lateinit var variantManager: VariantManager
121-
122110
@Mock
123111
private lateinit var mockFaviconDownloader: FaviconDownloader
124112

@@ -154,14 +142,11 @@ class BrowserTabViewModelTest {
154142
autoCompleteApi = mockAutoCompleteApi,
155143
appSettingsPreferencesStore = mockSettingsStore,
156144
bookmarksDao = bookmarksDao,
157-
defaultBrowserNotification = mockDefaultBrowserNotification,
158-
defaultBrowserDetector = mockDefaultBrowserDetector,
159145
longPressHandler = mockLongPressHandler,
160146
appConfigurationDao = appConfigurationDao,
161147
webViewSessionStorage = webViewSessionStorage,
162148
specialUrlDetector = SpecialUrlDetector(),
163-
faviconDownloader = mockFaviconDownloader,
164-
variantManager = variantManager
149+
faviconDownloader = mockFaviconDownloader
165150
)
166151

167152
testee.loadData("abc", null)

app/src/androidTest/java/com/duckduckgo/app/browser/defaultBrowsing/DefaultBrowserBannerNotificationTest.kt

Lines changed: 0 additions & 98 deletions
This file was deleted.

app/src/androidTest/java/com/duckduckgo/app/browser/defaultBrowsing/DefaultBrowserHomeScreenCallToActionTest.kt

Lines changed: 0 additions & 83 deletions
This file was deleted.

app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import android.app.Application
2020
import com.duckduckgo.app.TestApplication
2121
import com.duckduckgo.app.browser.autoComplete.BrowserAutoCompleteModule
2222
import com.duckduckgo.app.browser.di.BrowserModule
23-
import com.duckduckgo.app.browser.di.DefaultBrowserModule
2423
import com.duckduckgo.app.browser.favicon.FaviconModule
2524
import com.duckduckgo.app.httpsupgrade.di.HttpsUpgraderModule
2625
import com.duckduckgo.app.onboarding.di.OnboardingModule
@@ -55,7 +54,6 @@ import javax.inject.Singleton
5554
ResourceSurrogateModule::class,
5655
TrackerDetectionModule::class,
5756
NotificationModule::class,
58-
DefaultBrowserModule::class,
5957
OnboardingModule::class,
6058
VariantModule::class,
6159
FaviconModule::class

app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallSharedPreferencesTest.kt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@ class AppInstallSharedPreferencesTest {
3535
testee = AppInstallSharedPreferences(context)
3636
}
3737

38-
@Test
39-
fun whenInitializedThenUserHasNotBeenMarkedAsHavingPreviouslyDeclinedBanner() {
40-
assertFalse(testee.hasUserDeclinedDefaultBrowserBannerPreviously())
41-
}
42-
43-
@Test
44-
fun whenInitializedThenUserHasNotBeenMarkedAsHavingPreviouslyDeclinedHomeScreenCallToAction() {
45-
assertFalse(testee.hasUserDeclinedDefaultBrowserHomeScreenCallToActionPreviously())
46-
}
47-
4838
@Test
4939
fun whenInitializedThenInstallTimestampNotYetRecorded() {
5040
assertFalse(testee.hasInstallTimestampRecorded())
@@ -63,19 +53,4 @@ class AppInstallSharedPreferencesTest {
6353
testee.installTimestamp = timestamp
6454
assertEquals(timestamp, testee.installTimestamp)
6555
}
66-
67-
@Test
68-
fun whenUserPreviouslyDeclinedBannerThenThatIsReturnedWhenQueried() {
69-
val timestamp = 1L
70-
testee.recordUserDeclinedBannerToSetDefaultBrowser(timestamp)
71-
assertTrue(testee.hasUserDeclinedDefaultBrowserBannerPreviously())
72-
}
73-
74-
@Test
75-
fun whenUserPreviouslyDeclinedHomeScreenCallToActionThenThatIsReturnedWhenQueried() {
76-
val timestamp = 1L
77-
testee.recordUserDeclinedHomeScreenCallToActionToSetDefaultBrowser(timestamp)
78-
assertTrue(testee.hasUserDeclinedDefaultBrowserHomeScreenCallToActionPreviously())
79-
}
80-
8156
}

app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,14 @@
1616

1717
package com.duckduckgo.app.statistics
1818

19-
import com.duckduckgo.app.statistics.VariantManager.VariantFeature.DefaultBrowserFeature.ShowHomeScreenCallToActionBottomSheet
20-
import com.duckduckgo.app.statistics.VariantManager.VariantFeature.DefaultBrowserFeature.ShowHomeScreenCallToActionSimpleButton
21-
import org.junit.Assert.*
19+
import org.junit.Assert.assertEquals
20+
import org.junit.Assert.fail
2221
import org.junit.Test
2322

2423
class VariantManagerTest {
2524

2625
private val variants = VariantManager.ACTIVE_VARIANTS
2726

28-
@Test
29-
fun homeScreenCallToActionButtonVariantConfiguredCorrectly() {
30-
val variant = variants.firstOrNull { it.key == "mq" }
31-
assertEqualsDouble(1.0, variant!!.weight)
32-
assertTrue(variant.hasFeature(ShowHomeScreenCallToActionSimpleButton))
33-
assertEquals(1, variant.features.size)
34-
}
35-
36-
@Test
37-
fun homeScreenCallToActionBottomSheetVariantConfiguredCorrectly() {
38-
val variant = variants.firstOrNull { it.key == "mp" }
39-
assertEqualsDouble(1.0, variant!!.weight)
40-
assertTrue(variant.hasFeature(ShowHomeScreenCallToActionBottomSheet))
41-
assertEquals(1, variant.features.size)
42-
}
43-
44-
@Test
45-
fun controlVariantConfiguredCorrectly() {
46-
val variant = variants.firstOrNull { it.key == "mr" }
47-
assertEqualsDouble(1.0, variant!!.weight)
48-
assertEquals(0, variant.features.size)
49-
}
50-
5127
@Test
5228
fun serpVariantAConfiguredCorrectly() {
5329
val variant = variants.firstOrNull { it.key == "sa" }

0 commit comments

Comments
 (0)