refactor:adjust tests for PrivacySettings

Author: shamim-emon

feature/mail/message/list/src/test/kotlin/net/thunderbird/feature/mail/message/list/domain/usecase/BuildSwipeActionsTest.kt

@@ -5,6 +5,7 @@ import assertk.assertThat
 import assertk.assertions.containsOnly
 import assertk.assertions.hasSize
 import assertk.assertions.isEmpty
+import dev.mokkery.mock
 import kotlin.random.Random
 import kotlin.test.Test
 import kotlin.uuid.ExperimentalUuidApi
@@ -19,6 +20,8 @@ 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.privacy.PrivacySettings
+import net.thunderbird.core.preference.privacy.PrivacySettingsManager
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.feature.mail.message.list.fakes.FakeAccount
 import net.thunderbird.feature.mail.message.list.fakes.FakeAccountManager
@@ -54,6 +57,8 @@ class BuildSwipeActionsTest {
             quietTimeEnds = "7:00",
             isQuietTime = false,
             isQuietTimeEnabled = false,
+            privacy = PrivacySettings(isHideTimeZone = false),
+
         )
 
     @Test
@@ -366,15 +371,16 @@ class BuildSwipeActionsTest {
         accountsUuids: List<String>,
         storageValues: Map<String, String> = mapOf(),
     ): BuildSwipeActions = BuildSwipeActions(
-        generalSettingsManager = FakeGeneralSettingsManager(initialGeneralSettings),
+        generalSettingsManager = FakeGeneralSettingsManager(initialGeneralSettings, mock()),
         accountManager = FakeAccountManager(accounts = accountsUuids.map { FakeAccount(uuid = it) }),
         storage = FakeStorage(storageValues),
     )
 }
 
 private class FakeGeneralSettingsManager(
     initialGeneralSettings: GeneralSettings,
-) : GeneralSettingsManager {
+    private val privacySettingsManager: PrivacySettingsManager,
+) : GeneralSettingsManager, PrivacySettingsManager by privacySettingsManager {
     private val generalSettings = MutableStateFlow(initialGeneralSettings)
     override fun getSettings(): GeneralSettings = generalSettings.value
 
@@ -447,6 +453,10 @@ private class FakeGeneralSettingsManager(
     override fun setIsQuietTimeEnabled(isQuietTimeEnabled: Boolean) = error(
         "not implemented",
     )
+
+    override fun setIsHideTimeZone(isHideTimeZone: Boolean) = error(
+        "not implemented",
+    )
 }
 
 private class FakeStorage(

legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt

@@ -19,6 +19,7 @@ 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.privacy.PrivacySettings
 import org.junit.Before
 import org.junit.Test
 import org.mockito.kotlin.doReturn
@@ -64,6 +65,7 @@ class MessageHelperTest : RobolectricTest() {
                 isQuietTimeEnabled = false,
                 quietTimeEnds = "7:00",
                 quietTimeStarts = "7:00",
+                privacy = PrivacySettings(isHideTimeZone = false),
             ),
         )
     }

legacy/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt

@@ -2,25 +2,63 @@ package com.fsck.k9.message.quote
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import com.fsck.k9.K9
 import java.time.ZonedDateTime
 import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
+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.privacy.PrivacySettings
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 class QuoteDateFormatterTest {
     private lateinit var originalLocale: Locale
     private var originalTimeZone: TimeZone? = null
-    private val quoteDateFormatter = QuoteDateFormatter()
+    private val generalSettingsManager: GeneralSettingsManager = mock()
+    private val fakeGeneralSettings = GeneralSettings(
+        backgroundSync = BackgroundSync.NEVER,
+        showRecentChanges = false,
+        appTheme = AppTheme.FOLLOW_SYSTEM,
+        messageViewTheme = SubTheme.USE_GLOBAL,
+        messageComposeTheme = SubTheme.USE_GLOBAL,
+        fixedMessageViewTheme = false,
+        privacy = PrivacySettings(isHideTimeZone = false),
+        isAutoFitWidth = false,
+        isThreadedViewEnabled = false,
+        isUseMessageViewFixedWidthFont = false,
+        isShowContactPicture = false,
+        isMessageListSenderAboveSubject = false,
+        isChangeContactNameColor = false,
+        isColorizeMissingContactPictures = false,
+        shouldShowSetupArchiveFolderDialog = false,
+        isShowContactName = false,
+        isShowUnifiedInbox = false,
+        isShowStarredCount = false,
+        isShowComposeButtonOnMessageList = false,
+        isUseBackgroundAsUnreadIndicator = false,
+        isShowCorrespondentNames = false,
+        isShowAnimations = false,
+        isShowMessageListStars = false,
+
+    )
+    private val quoteDateFormatter = QuoteDateFormatter(
+        generalSettingsManager = generalSettingsManager,
+    )
 
     @Before
     fun setUp() {
         originalLocale = Locale.getDefault()
         originalTimeZone = TimeZone.getDefault()
         TimeZone.setDefault(TimeZone.getTimeZone("GMT+02:00"))
+        whenever(generalSettingsManager.getSettings()) doReturn fakeGeneralSettings
     }
 
     @After
@@ -31,7 +69,8 @@ class QuoteDateFormatterTest {
 
     @Test
     fun hideTimeZoneEnabled_UsLocale() {
-        K9.isHideTimeZone = true
+        whenever(generalSettingsManager.getSettings()) doReturn
+            fakeGeneralSettings.copy(privacy = fakeGeneralSettings.privacy.copy(isHideTimeZone = true))
         Locale.setDefault(Locale.US)
 
         val formattedDate = quoteDateFormatter.format("2020-09-19T20:00:00+00:00".toDate())
@@ -41,7 +80,8 @@ class QuoteDateFormatterTest {
 
     @Test
     fun hideTimeZoneEnabled_GermanyLocale() {
-        K9.isHideTimeZone = true
+        whenever(generalSettingsManager.getSettings()) doReturn
+            fakeGeneralSettings.copy(privacy = fakeGeneralSettings.privacy.copy(isHideTimeZone = true))
         Locale.setDefault(Locale.GERMANY)
 
         val formattedDate = quoteDateFormatter.format("2020-09-19T20:00:00+00:00".toDate())
@@ -51,7 +91,6 @@ class QuoteDateFormatterTest {
 
     @Test
     fun hideTimeZoneDisabled_UsLocale() {
-        K9.isHideTimeZone = false
         Locale.setDefault(Locale.US)
 
         val formattedDate = quoteDateFormatter.format("2020-09-19T20:00:00+00:00".toDate())
@@ -61,7 +100,6 @@ class QuoteDateFormatterTest {
 
     @Test
     fun hideTimeZoneDisabled_GermanyLocale() {
-        K9.isHideTimeZone = false
         Locale.setDefault(Locale.GERMANY)
 
         val formattedDate = quoteDateFormatter.format("2020-09-19T20:00:00+00:00".toDate())

legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt

@@ -14,6 +14,7 @@ import net.thunderbird.core.preference.AppTheme
 import net.thunderbird.core.preference.BackgroundSync
 import net.thunderbird.core.preference.GeneralSettings
 import net.thunderbird.core.preference.SubTheme
+import net.thunderbird.core.preference.privacy.PrivacySettings
 import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
@@ -174,6 +175,7 @@ class NotificationContentCreatorTest : RobolectricTest() {
                     quietTimeStarts = "7:00",
                     quietTimeEnds = "7:00",
                     isQuietTimeEnabled = false,
+                    privacy = PrivacySettings(isHideTimeZone = false),
                 )
             },
         )