test: update tests to accommodate PlatformConfigProvider integration

shamim-emon · shamim-emon · commit b9af096c69c8 · 2025-11-16T18:49:55.000+06:00
diff --git a/feature/mail/message/list/src/test/kotlin/net/thunderbird/feature/mail/message/list/domain/usecase/BuildSwipeActionsTest.kt b/feature/mail/message/list/src/test/kotlin/net/thunderbird/feature/mail/message/list/domain/usecase/BuildSwipeActionsTest.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import net.thunderbird.core.common.action.SwipeAction
 import net.thunderbird.core.common.action.SwipeActions
+import net.thunderbird.core.common.appConfig.PlatformConfigProvider
 import net.thunderbird.core.preference.GeneralSettings
 import net.thunderbird.core.preference.GeneralSettingsManager
 import net.thunderbird.core.preference.display.DisplaySettings
@@ -32,6 +33,7 @@ class BuildSwipeActionsTest {
             network = NetworkSettings(),
             notification = NotificationPreference(),
             privacy = PrivacySettings(),
+            platformConfigProvider = FakePlatformConfigProvider(),
         )
 
     @Test
@@ -400,3 +402,8 @@ private class FakeStorage(
 
     override fun getStringOrNull(key: String): String? = values[key]
 }
+
+private class FakePlatformConfigProvider : PlatformConfigProvider {
+    override val isDebug: Boolean
+        get() = true
+}
diff --git a/legacy/core/src/test/java/com/fsck/k9/TestApp.kt b/legacy/core/src/test/java/com/fsck/k9/TestApp.kt
@@ -16,6 +16,7 @@ import com.fsck.k9.storage.storageModule
 import net.thunderbird.core.android.account.AccountDefaultsProvider
 import net.thunderbird.core.android.account.LegacyAccountManager
 import net.thunderbird.core.android.preferences.TestStoragePersister
+import net.thunderbird.core.common.appConfig.PlatformConfigProvider
 import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagProvider
 import net.thunderbird.core.featureflag.InMemoryFeatureFlagProvider
@@ -96,4 +97,10 @@ val testModule = module {
     single<OutboxFolderManager> { FakeOutboxFolderManager() }
     single<LegacyAccountManager> { mock() }
     single<NotificationIconResourceProvider> { TestNotificationIconResourceProvider() }
+    single<PlatformConfigProvider> { FakePlatformConfigProvider() }
+}
+
+class FakePlatformConfigProvider : PlatformConfigProvider {
+    override val isDebug: Boolean
+        get() = true
 }
diff --git a/legacy/core/src/test/java/com/fsck/k9/UnifiedInboxConfiguratorTest.kt b/legacy/core/src/test/java/com/fsck/k9/UnifiedInboxConfiguratorTest.kt
@@ -2,6 +2,7 @@ package com.fsck.k9
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import com.fsck.k9.notification.FakePlatformConfigProvider
 import com.fsck.k9.preferences.UnifiedInboxConfigurator
 import net.thunderbird.core.android.account.LegacyAccountDtoManager
 import net.thunderbird.core.preference.GeneralSettings
@@ -32,6 +33,7 @@ class UnifiedInboxConfiguratorTest {
         generalSettingsManager =
             FakeGeneralSettingsManager(
                 GeneralSettings(
+                    platformConfigProvider = FakePlatformConfigProvider(),
                     display = DisplaySettings(
                         inboxSettings = DisplayInboxSettings(
                             isShowUnifiedInbox = false,
diff --git a/legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java b/legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java
@@ -33,11 +33,12 @@
 import com.fsck.k9.message.quote.InsertableHtmlContent;
 import net.thunderbird.core.logging.legacy.Log;
 import net.thunderbird.core.logging.testing.TestLogger;
-import net.thunderbird.core.preference.AppTheme;
-import net.thunderbird.core.preference.BackgroundSync;
 import net.thunderbird.core.preference.GeneralSettings;
 import net.thunderbird.core.preference.GeneralSettingsManager;
-import net.thunderbird.core.preference.SubTheme;
+import net.thunderbird.core.preference.debugging.DebuggingSettings;
+import net.thunderbird.core.preference.display.DisplaySettings;
+import net.thunderbird.core.preference.interaction.InteractionSettings;
+import net.thunderbird.core.preference.network.NetworkSettings;
 import net.thunderbird.core.preference.notification.NotificationPreference;
 import net.thunderbird.core.preference.privacy.PrivacySettings;
 import org.jetbrains.annotations.NotNull;
@@ -211,7 +212,15 @@ public class MessageBuilderTest extends RobolectricTest {
         @NonNull
         @Override
         public GeneralSettings getSettings() {
-            return new GeneralSettings();
+            return  new GeneralSettings(
+                mock(),
+                new NetworkSettings(),
+                new NotificationPreference(),
+                new DisplaySettings(),
+                new PrivacySettings(),
+                new DebuggingSettings(true,false,false),
+                new InteractionSettings()
+            );
         }
 
         @NonNull
diff --git a/legacy/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
@@ -3,13 +3,13 @@ package com.fsck.k9.message
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import com.fsck.k9.message.quote.InsertableHtmlContent
+import com.fsck.k9.notification.FakePlatformConfigProvider
 import net.thunderbird.core.logging.legacy.Log
 import net.thunderbird.core.logging.testing.TestLogger
 import net.thunderbird.core.preference.GeneralSettings
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
-import org.mockito.Mockito.mock
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 
@@ -162,7 +162,7 @@ class TextBodyBuilderTest(val testData: TestData) {
         Log.logger = TestLogger()
         toTest = TextBodyBuilder(
             MESSAGE_TEXT,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
         toTest.setAppendSignature(testData.appendSignature)
         toTest.setIncludeQuotedText(testData.includeQuotedText)
diff --git a/legacy/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt
@@ -2,6 +2,7 @@ package com.fsck.k9.message.quote
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import com.fsck.k9.notification.FakePlatformConfigProvider
 import java.time.ZonedDateTime
 import java.util.Date
 import java.util.Locale
@@ -28,6 +29,7 @@ class QuoteDateFormatterTest {
         network = NetworkSettings(),
         notification = NotificationPreference(),
         privacy = PrivacySettings(),
+        platformConfigProvider = FakePlatformConfigProvider(),
 
     )
     private val quoteDateFormatter = QuoteDateFormatter(
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt
@@ -152,6 +152,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() {
                     display = DisplaySettings(),
                     notification = NotificationPreference(),
                     privacy = PrivacySettings(),
+                    platformConfigProvider = FakePlatformConfigProvider(),
                 )
             },
         ) {
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt
@@ -10,6 +10,7 @@ import kotlin.time.ExperimentalTime
 import net.thunderbird.core.android.account.LegacyAccountDto
 import net.thunderbird.core.android.testing.MockHelper.mockBuilder
 import net.thunderbird.core.android.testing.RobolectricTest
+import net.thunderbird.core.common.appConfig.PlatformConfigProvider
 import net.thunderbird.core.preference.GeneralSettings
 import net.thunderbird.core.preference.display.DisplaySettings
 import net.thunderbird.core.preference.network.NetworkSettings
@@ -152,6 +153,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {
                 display = DisplaySettings(),
                 notification = NotificationPreference(),
                 privacy = PrivacySettings(),
+                platformConfigProvider = FakePlatformConfigProvider(),
             )
         },
     ) {
@@ -160,3 +162,8 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {
         }
     }
 }
+
+class FakePlatformConfigProvider : PlatformConfigProvider {
+    override val isDebug: Boolean
+        get() = true
+}
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt
@@ -68,6 +68,7 @@ class NewMailNotificationManagerTest {
                         quietTimeEnds = "00:00",
                     ),
                     privacy = PrivacySettings(),
+                    platformConfigProvider = FakePlatformConfigProvider(),
                 )
             },
         ),
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt
@@ -153,6 +153,7 @@ class NotificationContentCreatorTest : RobolectricTest() {
                     display = DisplaySettings(),
                     notification = NotificationPreference(),
                     privacy = PrivacySettings(),
+                    platformConfigProvider = FakePlatformConfigProvider(),
                 )
             },
         )
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
@@ -52,6 +52,7 @@ class SendFailedNotificationControllerTest : RobolectricTest() {
                 network = NetworkSettings(),
                 notification = NotificationPreference(),
                 privacy = PrivacySettings(),
+                platformConfigProvider = FakePlatformConfigProvider(),
             )
         },
         outboxFolderManager = mock(),
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt
@@ -43,6 +43,7 @@ class SummaryNotificationDataCreatorTest {
             quietTimeEnds = "00:00",
         ),
         privacy = PrivacySettings(),
+        platformConfigProvider = FakePlatformConfigProvider(),
     )
     private val notificationDataCreator = SummaryNotificationDataCreator(
         singleMessageNotificationDataCreator = SingleMessageNotificationDataCreator(),
diff --git a/legacy/core/src/test/java/com/fsck/k9/preferences/AccountSettingsUpgraderTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/AccountSettingsUpgraderTest.kt
@@ -8,6 +8,7 @@ import assertk.assertions.prop
 import com.fsck.k9.preferences.Settings.BooleanSetting
 import com.fsck.k9.preferences.Settings.StringSetting
 import kotlin.test.Test
+import net.thunderbird.core.common.appConfig.PlatformConfigProvider
 import net.thunderbird.core.logging.legacy.Log
 import net.thunderbird.core.logging.testing.TestLogger
 import net.thunderbird.core.preference.GeneralSettings
@@ -45,7 +46,12 @@ class AccountSettingsUpgraderTest {
                 ),
             ),
             upgraders = emptyMap(),
-            generalSettingsManager = mock { on { getConfig() } doReturn GeneralSettings() },
+            generalSettingsManager = mock {
+                on { getConfig() } doReturn
+                    GeneralSettings(
+                        platformConfigProvider = FakePlatformConfigProvider(),
+                    )
+            },
         )
         val combinedUpgraders = mapOf(
             2 to {
@@ -71,7 +77,12 @@ class AccountSettingsUpgraderTest {
             settingsDescriptions = accountSettingsDescriptions,
             upgraders = emptyMap(),
             combinedUpgraders = combinedUpgraders,
-            generalSettingsManager = mock { on { getConfig() } doReturn GeneralSettings() },
+            generalSettingsManager = mock {
+                on { getConfig() } doReturn
+                    GeneralSettings(
+                        platformConfigProvider = FakePlatformConfigProvider(),
+                    )
+            },
         )
         val account = ValidatedSettings.Account(
             uuid = "irrelevant",
@@ -123,19 +134,34 @@ class AccountSettingsUpgraderTest {
         return IdentitySettingsUpgrader(
             settingsDescriptions = emptyMap(),
             upgraders = emptyMap(),
-            generalSettingsManager = mock { on { getConfig() } doReturn GeneralSettings() },
+            generalSettingsManager = mock {
+                on { getConfig() } doReturn
+                    GeneralSettings(
+                        platformConfigProvider = FakePlatformConfigProvider(),
+                    )
+            },
         )
     }
 
     private fun irrelevantServerSettingsUpgrader(): ServerSettingsUpgrader {
         return ServerSettingsUpgrader(
             settingsDescriptions = emptyMap(),
             upgraders = emptyMap(),
-            generalSettingsManager = mock { on { getConfig() } doReturn GeneralSettings() },
+            generalSettingsManager = mock {
+                on { getConfig() } doReturn
+                    GeneralSettings(
+                        platformConfigProvider = FakePlatformConfigProvider(),
+                    )
+            },
         )
     }
 
     private fun irrelevantServer(): ValidatedSettings.Server {
         return ValidatedSettings.Server(type = "irrelevant", settings = emptyMap(), extras = emptyMap())
     }
 }
+
+private class FakePlatformConfigProvider : PlatformConfigProvider {
+    override val isDebug: Boolean
+        get() = true
+}
diff --git a/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsUpgradeHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsUpgradeHelperTest.kt
@@ -7,6 +7,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
 import assertk.assertions.isInstanceOf
 import assertk.fail
+import com.fsck.k9.notification.FakePlatformConfigProvider
 import com.fsck.k9.preferences.Settings.BooleanSetting
 import com.fsck.k9.preferences.Settings.StringSetting
 import kotlin.test.Test
@@ -45,7 +46,7 @@ class SettingsUpgradeHelperTest {
             upgraders,
             settingsDescriptions,
             settings,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
 
         assertThat(result).isEqualTo(
@@ -78,7 +79,7 @@ class SettingsUpgradeHelperTest {
             upgraders,
             settingsDescriptions,
             settings,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
 
         assertThat(result).isEqualTo(
@@ -115,7 +116,7 @@ class SettingsUpgradeHelperTest {
             upgraders,
             settingsDescriptions,
             settings,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
 
         assertThat(result).isEqualTo(
@@ -148,7 +149,7 @@ class SettingsUpgradeHelperTest {
             upgraders,
             settingsDescriptions,
             settings,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
 
         assertThat(result).isEqualTo(
@@ -178,7 +179,12 @@ class SettingsUpgradeHelperTest {
                 upgraders,
                 settingsDescriptions,
                 settings,
-                mock { on { getConfig() } doReturn GeneralSettings() },
+                mock {
+                    on { getConfig() } doReturn
+                        GeneralSettings(
+                            platformConfigProvider = FakePlatformConfigProvider(),
+                        )
+                },
             )
         }.isInstanceOf<AssertionError>()
             .hasMessage("First version of a setting must be non-null!")
@@ -209,7 +215,7 @@ class SettingsUpgradeHelperTest {
             upgraders,
             settingsDescriptions,
             settings,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
 
         assertThat(result).isEqualTo(
@@ -252,7 +258,7 @@ class SettingsUpgradeHelperTest {
             upgraders,
             settingsDescriptions,
             settings,
-            mock { on { getConfig() } doReturn GeneralSettings() },
+            mock { on { getConfig() } doReturn GeneralSettings(platformConfigProvider = FakePlatformConfigProvider()) },
         )
 
         assertThat(result).isEqualTo(
diff --git a/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt
@@ -15,6 +15,7 @@ import com.fsck.k9.legacyCoreModules
 import com.fsck.k9.preferences.K9StoragePersister
 import net.thunderbird.core.android.account.AccountDefaultsProvider
 import net.thunderbird.core.android.account.LegacyAccountManager
+import net.thunderbird.core.common.appConfig.PlatformConfigProvider
 import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagProvider
 import net.thunderbird.core.featureflag.InMemoryFeatureFlagProvider
@@ -89,4 +90,10 @@ val testModule = module {
             override val pushNotificationIcon: Int = 0
         }
     }
+    single<PlatformConfigProvider> { FakePlatformConfigProvider() }
+}
+
+class FakePlatformConfigProvider : PlatformConfigProvider {
+    override val isDebug: Boolean
+        get() = true
 }
diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt
@@ -7,6 +7,7 @@ import com.fsck.k9.contacts.ContactPictureLoader
 import net.thunderbird.core.android.account.AccountDefaultsProvider
 import net.thunderbird.core.android.account.LegacyAccountManager
 import net.thunderbird.core.android.preferences.TestStoragePersister
+import net.thunderbird.core.common.appConfig.PlatformConfigProvider
 import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagProvider
 import net.thunderbird.core.featureflag.InMemoryFeatureFlagProvider
@@ -81,4 +82,10 @@ val testModule = module {
 
     single<ContactPictureLoader> { mock() }
     single<LegacyAccountManager> { mock() }
+    single<PlatformConfigProvider> { FakePlatformConfigProvider() }
+}
+
+class FakePlatformConfigProvider : PlatformConfigProvider {
+    override val isDebug: Boolean
+        get() = true
 }
diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() {`
`152`	`152`	`display = DisplaySettings(),`
`153`	`153`	`notification = NotificationPreference(),`
`154`	`154`	`privacy = PrivacySettings(),`
	`155`	`+ platformConfigProvider = FakePlatformConfigProvider(),`
`155`	`156`	`)`
`156`	`157`	`},`
`157`	`158`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import kotlin.time.ExperimentalTime`
`10`	`10`	`import net.thunderbird.core.android.account.LegacyAccountDto`
`11`	`11`	`import net.thunderbird.core.android.testing.MockHelper.mockBuilder`
`12`	`12`	`import net.thunderbird.core.android.testing.RobolectricTest`
	`13`	`+import net.thunderbird.core.common.appConfig.PlatformConfigProvider`
`13`	`14`	`import net.thunderbird.core.preference.GeneralSettings`
`14`	`15`	`import net.thunderbird.core.preference.display.DisplaySettings`
`15`	`16`	`import net.thunderbird.core.preference.network.NetworkSettings`
`@@ -152,6 +153,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {`
`152`	`153`	`display = DisplaySettings(),`
`153`	`154`	`notification = NotificationPreference(),`
`154`	`155`	`privacy = PrivacySettings(),`
	`156`	`+ platformConfigProvider = FakePlatformConfigProvider(),`
`155`	`157`	`)`
`156`	`158`	`},`
`157`	`159`	`) {`
`@@ -160,3 +162,8 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {`
`160`	`162`	`}`
`161`	`163`	`}`
`162`	`164`	`}`
	`165`	`+`
	`166`	`+class FakePlatformConfigProvider : PlatformConfigProvider {`
	`167`	`+ override val isDebug: Boolean`
	`168`	`+ get() = true`
	`169`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ class NewMailNotificationManagerTest {`
`68`	`68`	`quietTimeEnds = "00:00",`
`69`	`69`	`),`
`70`	`70`	`privacy = PrivacySettings(),`
	`71`	`+ platformConfigProvider = FakePlatformConfigProvider(),`
`71`	`72`	`)`
`72`	`73`	`},`
`73`	`74`	`),`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ class NotificationContentCreatorTest : RobolectricTest() {`
`153`	`153`	`display = DisplaySettings(),`
`154`	`154`	`notification = NotificationPreference(),`
`155`	`155`	`privacy = PrivacySettings(),`
	`156`	`+ platformConfigProvider = FakePlatformConfigProvider(),`
`156`	`157`	`)`
`157`	`158`	`},`
`158`	`159`	`)`