Skip to content

Commit bc62cbc

Browse files
committed
refactor(test): adjust tests for isHideUserAgent
1 parent 225c17b commit bc62cbc

File tree

11 files changed

+336
-13
lines changed

11 files changed

+336
-13
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ class BuildSwipeActionsTest {
5757
quietTimeEnds = "7:00",
5858
isQuietTime = false,
5959
isQuietTimeEnabled = false,
60-
privacy = PrivacySettings(isHideTimeZone = false),
61-
60+
privacy = PrivacySettings(
61+
isHideTimeZone = false,
62+
isHideUserAgent = false,
63+
),
6264
)
6365

6466
@Test
@@ -457,6 +459,10 @@ private class FakeGeneralSettingsManager(
457459
override fun setIsHideTimeZone(isHideTimeZone: Boolean) = error(
458460
"not implemented",
459461
)
462+
463+
override fun setIsHideUserAgent(isHideUserAgent: Boolean) = error(
464+
"not implemented",
465+
)
460466
}
461467

462468
private class FakeStorage(

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ class MessageHelperTest : RobolectricTest() {
6565
isQuietTimeEnabled = false,
6666
quietTimeEnds = "7:00",
6767
quietTimeStarts = "7:00",
68-
privacy = PrivacySettings(isHideTimeZone = false),
68+
privacy = PrivacySettings(
69+
isHideTimeZone = false,
70+
isHideUserAgent = false,
71+
),
6972
),
7073
)
7174
}

legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java

Lines changed: 188 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import java.util.List;
1313
import java.util.Map;
1414

15+
import androidx.annotation.NonNull;
16+
import kotlinx.coroutines.flow.Flow;
1517
import net.thunderbird.core.android.testing.RobolectricTest;
1618
import net.thunderbird.core.android.account.QuoteStyle;
1719
import com.fsck.k9.CoreResourceProvider;
@@ -31,6 +33,12 @@
3133
import com.fsck.k9.message.quote.InsertableHtmlContent;
3234
import net.thunderbird.core.logging.legacy.Log;
3335
import net.thunderbird.core.logging.testing.TestLogger;
36+
import net.thunderbird.core.preference.AppTheme;
37+
import net.thunderbird.core.preference.BackgroundSync;
38+
import net.thunderbird.core.preference.GeneralSettings;
39+
import net.thunderbird.core.preference.GeneralSettingsManager;
40+
import net.thunderbird.core.preference.SubTheme;
41+
import net.thunderbird.core.preference.privacy.PrivacySettings;
3442
import org.junit.Before;
3543
import org.junit.Test;
3644
import org.mockito.ArgumentCaptor;
@@ -197,6 +205,183 @@ public class MessageBuilderTest extends RobolectricTest {
197205
private BoundaryGenerator boundaryGenerator;
198206
private CoreResourceProvider resourceProvider = new TestCoreResourceProvider();
199207
private Callback callback;
208+
private final GeneralSettingsManager fakeSettingsManager = new GeneralSettingsManager() {
209+
@Override
210+
public void setIsHideTimeZone(boolean isHideTimeZone) {
211+
throw new UnsupportedOperationException("not implemented");
212+
}
213+
214+
@NonNull
215+
@Override
216+
public PrivacySettings getPrivacySettings() {
217+
throw new UnsupportedOperationException("not implemented");
218+
}
219+
220+
@Override
221+
public void setIsQuietTimeEnabled(boolean isQuietTimeEnabled) {
222+
throw new UnsupportedOperationException("not implemented");
223+
}
224+
225+
@Override
226+
public void setQuietTimeStarts(@NonNull String quietTimeStarts) {
227+
throw new UnsupportedOperationException("not implemented");
228+
}
229+
230+
@Override
231+
public void setQuietTimeEnds(@NonNull String quietTimeEnds) {
232+
throw new UnsupportedOperationException("not implemented");
233+
}
234+
235+
@NonNull
236+
@Override
237+
public GeneralSettings getSettings() {
238+
return new GeneralSettings(
239+
BackgroundSync.NEVER,
240+
false,
241+
AppTheme.FOLLOW_SYSTEM,
242+
SubTheme.USE_GLOBAL,
243+
SubTheme.USE_GLOBAL,
244+
false,
245+
false,
246+
false,
247+
false,
248+
false,
249+
false,
250+
false,
251+
false,
252+
false,
253+
false,
254+
false,
255+
false,
256+
false,
257+
false,
258+
false,
259+
false,
260+
false,
261+
"07:00",
262+
"07:00",
263+
false,
264+
false,
265+
new PrivacySettings(false, false)
266+
);
267+
}
268+
269+
@NonNull
270+
@Override
271+
public Flow<GeneralSettings> getSettingsFlow() {
272+
throw new UnsupportedOperationException("not implemented");
273+
}
274+
275+
@Override
276+
public void setShowRecentChanges(boolean showRecentChanges) {
277+
throw new UnsupportedOperationException("not implemented");
278+
}
279+
280+
@Override
281+
public void setAppTheme(@NonNull AppTheme appTheme) {
282+
throw new UnsupportedOperationException("not implemented");
283+
}
284+
285+
@Override
286+
public void setMessageViewTheme(@NonNull SubTheme subTheme) {
287+
throw new UnsupportedOperationException("not implemented");
288+
}
289+
290+
@Override
291+
public void setMessageComposeTheme(@NonNull SubTheme subTheme) {
292+
throw new UnsupportedOperationException("not implemented");
293+
}
294+
295+
@Override
296+
public void setFixedMessageViewTheme(boolean fixedMessageViewTheme) {
297+
throw new UnsupportedOperationException("not implemented");
298+
}
299+
300+
@Override
301+
public void setIsShowUnifiedInbox(boolean isShowUnifiedInbox) {
302+
throw new UnsupportedOperationException("not implemented");
303+
}
304+
305+
@Override
306+
public void setIsShowStarredCount(boolean isShowStarredCount) {
307+
throw new UnsupportedOperationException("not implemented");
308+
}
309+
310+
@Override
311+
public void setIsShowMessageListStars(boolean isShowMessageListStars) {
312+
throw new UnsupportedOperationException("not implemented");
313+
}
314+
315+
@Override
316+
public void setIsShowAnimations(boolean isShowAnimations) {
317+
throw new UnsupportedOperationException("not implemented");
318+
}
319+
320+
@Override
321+
public void setIsShowCorrespondentNames(boolean isShowCorrespondentNames) {
322+
throw new UnsupportedOperationException("not implemented");
323+
}
324+
325+
@Override
326+
public void setSetupArchiveShouldNotShowAgain(boolean shouldShowSetupArchiveFolderDialog) {
327+
throw new UnsupportedOperationException("not implemented");
328+
}
329+
330+
@Override
331+
public void setIsMessageListSenderAboveSubject(boolean isMessageListSenderAboveSubject) {
332+
throw new UnsupportedOperationException("not implemented");
333+
}
334+
335+
@Override
336+
public void setIsShowContactName(boolean isShowContactName) {
337+
throw new UnsupportedOperationException("not implemented");
338+
}
339+
340+
@Override
341+
public void setIsShowContactPicture(boolean isShowContactPicture) {
342+
throw new UnsupportedOperationException("not implemented");
343+
}
344+
345+
@Override
346+
public void setIsChangeContactNameColor(boolean isChangeContactNameColor) {
347+
throw new UnsupportedOperationException("not implemented");
348+
}
349+
350+
@Override
351+
public void setIsColorizeMissingContactPictures(boolean isColorizeMissingContactPictures) {
352+
throw new UnsupportedOperationException("not implemented");
353+
}
354+
355+
@Override
356+
public void setIsUseBackgroundAsUnreadIndicator(boolean isUseBackgroundAsUnreadIndicator) {
357+
throw new UnsupportedOperationException("not implemented");
358+
}
359+
360+
@Override
361+
public void setIsShowComposeButtonOnMessageList(boolean isShowComposeButtonOnMessageList) {
362+
throw new UnsupportedOperationException("not implemented");
363+
}
364+
365+
@Override
366+
public void setIsThreadedViewEnabled(boolean isThreadedViewEnabled) {
367+
throw new UnsupportedOperationException("not implemented");
368+
}
369+
370+
@Override
371+
public void setIsUseMessageViewFixedWidthFont(boolean isUseMessageViewFixedWidthFont) {
372+
throw new UnsupportedOperationException("not implemented");
373+
}
374+
375+
@Override
376+
public void setIsAutoFitWidth(boolean isAutoFitWidth) {
377+
throw new UnsupportedOperationException("not implemented");
378+
}
379+
380+
@Override
381+
public void setIsHideUserAgent(boolean isHideUserAgent) {
382+
throw new UnsupportedOperationException("not implemented");
383+
}
384+
};
200385

201386

202387
@Before
@@ -345,7 +530,7 @@ public void build_detachAndReattach_shouldSucceed() throws MessagingException {
345530

346531
@Test
347532
public void buildWithException_shouldThrow() throws MessagingException {
348-
MessageBuilder messageBuilder = new SimpleMessageBuilder(messageIdGenerator, boundaryGenerator, resourceProvider) {
533+
MessageBuilder messageBuilder = new SimpleMessageBuilder(messageIdGenerator, boundaryGenerator, resourceProvider, fakeSettingsManager) {
349534
@Override
350535
protected void buildMessageInternal() {
351536
queueMessageBuildException(new MessagingException("expected error"));
@@ -361,7 +546,7 @@ protected void buildMessageInternal() {
361546
@Test
362547
public void buildWithException_detachAndReattach_shouldThrow() throws MessagingException {
363548
Callback anotherCallback = mock(Callback.class);
364-
MessageBuilder messageBuilder = new SimpleMessageBuilder(messageIdGenerator, boundaryGenerator, resourceProvider) {
549+
MessageBuilder messageBuilder = new SimpleMessageBuilder(messageIdGenerator, boundaryGenerator, resourceProvider, fakeSettingsManager) {
365550
@Override
366551
protected void buildMessageInternal() {
367552
queueMessageBuildException(new MessagingException("expected error"));
@@ -436,7 +621,7 @@ public boolean isInternalAttachment() {
436621

437622
private MessageBuilder createSimpleMessageBuilder() {
438623
Identity identity = createIdentity();
439-
return new SimpleMessageBuilder(messageIdGenerator, boundaryGenerator, resourceProvider)
624+
return new SimpleMessageBuilder(messageIdGenerator, boundaryGenerator, resourceProvider, fakeSettingsManager)
440625
.setSubject(TEST_SUBJECT)
441626
.setSentDate(SENT_DATE)
442627
.setHideTimeZone(true)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ class QuoteDateFormatterTest {
3030
messageViewTheme = SubTheme.USE_GLOBAL,
3131
messageComposeTheme = SubTheme.USE_GLOBAL,
3232
fixedMessageViewTheme = false,
33-
privacy = PrivacySettings(isHideTimeZone = false),
33+
privacy = PrivacySettings(
34+
isHideTimeZone = false,
35+
isHideUserAgent = false,
36+
),
3437
isAutoFitWidth = false,
3538
isThreadedViewEnabled = false,
3639
isUseMessageViewFixedWidthFont = false,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() {
149149
quietTimeStarts = "7:00",
150150
quietTimeEnds = "7:00",
151151
isQuietTimeEnabled = false,
152-
privacy = PrivacySettings(isHideTimeZone = false),
152+
privacy = PrivacySettings(
153+
isHideTimeZone = false,
154+
isHideUserAgent = false,
155+
),
153156
)
154157
},
155158
) {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {
149149
quietTimeStarts = "7:00",
150150
quietTimeEnds = "7:00",
151151
isQuietTimeEnabled = false,
152-
privacy = PrivacySettings(isHideTimeZone = false),
152+
privacy = PrivacySettings(
153+
isHideTimeZone = false,
154+
isHideUserAgent = false,
155+
),
153156
)
154157
},
155158
) {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ class NewMailNotificationManagerTest {
7979
quietTimeStarts = "7:00",
8080
quietTimeEnds = "7:00",
8181
isQuietTimeEnabled = false,
82-
privacy = PrivacySettings(isHideTimeZone = false),
82+
privacy = PrivacySettings(
83+
isHideTimeZone = false,
84+
isHideUserAgent = false,
85+
),
8386
)
8487
},
8588
),

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,10 @@ class NotificationContentCreatorTest : RobolectricTest() {
175175
quietTimeStarts = "7:00",
176176
quietTimeEnds = "7:00",
177177
isQuietTimeEnabled = false,
178-
privacy = PrivacySettings(isHideTimeZone = false),
178+
privacy = PrivacySettings(
179+
isHideTimeZone = false,
180+
isHideUserAgent = false,
181+
),
179182
)
180183
},
181184
)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ class SendFailedNotificationControllerTest : RobolectricTest() {
6666
quietTimeStarts = "7:00",
6767
quietTimeEnds = "7:00",
6868
isQuietTimeEnabled = false,
69-
privacy = PrivacySettings(isHideTimeZone = false),
69+
privacy = PrivacySettings(
70+
isHideTimeZone = false,
71+
isHideUserAgent = false,
72+
),
7073
)
7174
},
7275
)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ class SummaryNotificationDataCreatorTest {
5858
quietTimeStarts = "0:00",
5959
quietTimeEnds = "23:59",
6060
isQuietTimeEnabled = false,
61-
privacy = PrivacySettings(isHideTimeZone = false),
61+
privacy = PrivacySettings(
62+
isHideTimeZone = false,
63+
isHideUserAgent = false,
64+
),
6265
)
6366
private val notificationDataCreator = SummaryNotificationDataCreator(
6467
singleMessageNotificationDataCreator = SingleMessageNotificationDataCreator(),

0 commit comments

Comments
 (0)