From 5910ecdc70cde3003695120e2642a86c29648e60 Mon Sep 17 00:00:00 2001 From: shamim-emon Date: Mon, 14 Apr 2025 06:20:36 +0600 Subject: [PATCH 1/2] Refactor: Moved :legacy:testing.testing to :core:android:testing --- core/android/testing/build.gradle.kts | 8 +++++++- .../net/thunderbird/core/android}/testing/MockHelper.kt | 2 +- .../thunderbird}/core/android/testing/RobolectricTest.kt | 2 +- .../thunderbird/core/android}/testing/StringExtensions.kt | 2 +- .../k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt | 2 +- .../com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java | 2 +- .../test/java/com/fsck/k9/helper/IdentityHelperTest.kt | 2 +- .../src/test/java/com/fsck/k9/helper/ListHeadersTest.java | 2 +- .../java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt | 2 +- .../core/src/test/java/com/fsck/k9/helper/MailToTest.kt | 2 +- .../src/test/java/com/fsck/k9/helper/MessageHelperTest.kt | 2 +- .../test/java/com/fsck/k9/helper/ReplyToParserTest.java | 2 +- .../com/fsck/k9/mailstore/AttachmentResolverTest.java | 2 +- .../java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt | 2 +- .../java/com/fsck/k9/message/IdentityHeaderParserTest.kt | 2 +- .../test/java/com/fsck/k9/message/MessageBuilderTest.java | 2 +- .../message/extractors/AttachmentInfoExtractorTest.java | 2 +- .../com/fsck/k9/message/quote/TextQuoteCreatorTest.kt | 2 +- .../fsck/k9/message/signature/HtmlSignatureRemoverTest.kt | 2 +- .../AuthenticationErrorNotificationControllerTest.kt | 4 ++-- .../CertificateErrorNotificationControllerTest.kt | 4 ++-- .../k9/notification/LockScreenNotificationCreatorTest.kt | 4 ++-- .../k9/notification/NotificationContentCreatorTest.kt | 2 +- .../com/fsck/k9/notification/NotificationDataStoreTest.kt | 2 +- .../notification/SendFailedNotificationControllerTest.kt | 4 ++-- .../k9/notification/SyncNotificationControllerTest.kt | 4 ++-- .../com/fsck/k9/preferences/SettingsFileParserTest.kt | 2 +- .../com/fsck/k9/activity/compose/ReplyToPresenterTest.kt | 2 +- .../com/fsck/k9/contacts/ContactLetterExtractorTest.kt | 2 +- .../fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt | 2 +- .../test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt | 2 +- .../MessageDetailsParticipantFormatterTest.kt | 2 +- .../com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt | 2 +- .../ui/messageview/MessageViewRecipientFormatterTest.kt | 2 +- .../fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt | 2 +- .../com/fsck/k9/ui/messageview/ViewIntentFinderTest.kt | 2 +- 36 files changed, 47 insertions(+), 41 deletions(-) rename {legacy/testing/src/main/java/com/fsck/k9 => core/android/testing/src/main/kotlin/net/thunderbird/core/android}/testing/MockHelper.kt (93%) rename core/android/testing/src/main/kotlin/{app/k9mail => net/thunderbird}/core/android/testing/RobolectricTest.kt (89%) rename {legacy/testing/src/main/java/com/fsck/k9 => core/android/testing/src/main/kotlin/net/thunderbird/core/android}/testing/StringExtensions.kt (62%) diff --git a/core/android/testing/build.gradle.kts b/core/android/testing/build.gradle.kts index 27f82be0152..464c8a671a2 100644 --- a/core/android/testing/build.gradle.kts +++ b/core/android/testing/build.gradle.kts @@ -3,10 +3,16 @@ plugins { } android { - namespace = "app.k9mail.core.android.testing" + namespace = "net.thunderbird.core.android.testing" } dependencies { api(libs.junit) api(libs.robolectric) + + implementation(projects.legacy.core) + + api(libs.koin.core) + api(libs.mockito.core) + api(libs.mockito.kotlin) } diff --git a/legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt b/core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/MockHelper.kt similarity index 93% rename from legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt rename to core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/MockHelper.kt index 32bca4f250b..9245e37d953 100644 --- a/legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt +++ b/core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/MockHelper.kt @@ -1,4 +1,4 @@ -package com.fsck.k9.testing +package net.thunderbird.core.android.testing import org.mockito.Mockito import org.mockito.Mockito.mock diff --git a/core/android/testing/src/main/kotlin/app/k9mail/core/android/testing/RobolectricTest.kt b/core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/RobolectricTest.kt similarity index 89% rename from core/android/testing/src/main/kotlin/app/k9mail/core/android/testing/RobolectricTest.kt rename to core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/RobolectricTest.kt index 79fec5f07f2..aeb3a66aa1c 100644 --- a/core/android/testing/src/main/kotlin/app/k9mail/core/android/testing/RobolectricTest.kt +++ b/core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/RobolectricTest.kt @@ -1,4 +1,4 @@ -package app.k9mail.core.android.testing +package net.thunderbird.core.android.testing import android.app.Application import org.junit.runner.RunWith diff --git a/legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt b/core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/StringExtensions.kt similarity index 62% rename from legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt rename to core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/StringExtensions.kt index 2e5a461c19c..b8b3a7899b3 100644 --- a/legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt +++ b/core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/StringExtensions.kt @@ -1,3 +1,3 @@ -package com.fsck.k9.testing +package net.thunderbird.core.android.testing fun String.removeNewlines(): String = replace("([\\r\\n])".toRegex(), "") diff --git a/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt index 4d30ff7543a..07035d312f7 100644 --- a/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt @@ -1,12 +1,12 @@ package com.fsck.k9.autocrypt -import app.k9mail.core.android.testing.RobolectricTest import assertk.assertThat import assertk.assertions.isEqualTo import assertk.assertions.isFalse import assertk.assertions.isNotNull import assertk.assertions.isNull import assertk.assertions.isTrue +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test class AutocryptDraftStateHeaderParserTest : RobolectricTest() { diff --git a/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java index 38d0b95a5db..9f3e1e2ca65 100644 --- a/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java +++ b/legacy/core/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderParserTest.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.io.InputStream; -import app.k9mail.core.android.testing.RobolectricTest; +import net.thunderbird.core.android.testing.RobolectricTest; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.internet.BinaryTempFileBody; import com.fsck.k9.mail.internet.MimeMessage; diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt index 87570fe73d7..8148009ee02 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt @@ -1,6 +1,5 @@ package com.fsck.k9.helper -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.Identity import app.k9mail.legacy.account.LegacyAccount import assertk.assertThat @@ -11,6 +10,7 @@ import com.fsck.k9.mail.Message.RecipientType import com.fsck.k9.mail.internet.AddressHeaderBuilder import com.fsck.k9.mail.internet.MimeMessage import java.util.UUID +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test class IdentityHelperTest : RobolectricTest() { diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java b/legacy/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java index f2ca0b835fd..58fda69a186 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java +++ b/legacy/core/src/test/java/com/fsck/k9/helper/ListHeadersTest.java @@ -1,6 +1,6 @@ package com.fsck.k9.helper; -import app.k9mail.core.android.testing.RobolectricTest; +import net.thunderbird.core.android.testing.RobolectricTest; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.internet.MimeMessage; diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt index bfef14f1041..8fe35ed69a7 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt @@ -1,11 +1,11 @@ package com.fsck.k9.helper import androidx.core.net.toUri -import app.k9mail.core.android.testing.RobolectricTest import assertk.assertThat import assertk.assertions.isEqualTo import assertk.assertions.isNull import com.fsck.k9.mail.internet.MimeMessage +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test class ListUnsubscribeHelperTest : RobolectricTest() { diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/MailToTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/MailToTest.kt index c72f22ccb64..cbeafdf21a0 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/MailToTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/helper/MailToTest.kt @@ -2,7 +2,6 @@ package com.fsck.k9.helper import android.net.Uri import androidx.core.net.toUri -import app.k9mail.core.android.testing.RobolectricTest import assertk.assertFailure import assertk.assertThat import assertk.assertions.containsExactly @@ -13,6 +12,7 @@ import assertk.assertions.isInstanceOf import assertk.assertions.isNull import assertk.assertions.isTrue import com.fsck.k9.mail.Address +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test class MailToTest : RobolectricTest() { diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt index c07fb629e72..a28690d0e4e 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt @@ -4,7 +4,6 @@ import android.graphics.Color import android.text.SpannableString import app.k9mail.core.android.common.contact.Contact import app.k9mail.core.android.common.contact.ContactRepository -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.core.common.mail.EmailAddress import app.k9mail.core.common.mail.toEmailAddressOrThrow import assertk.assertThat @@ -14,6 +13,7 @@ import com.fsck.k9.CoreResourceProvider import com.fsck.k9.TestCoreResourceProvider import com.fsck.k9.helper.MessageHelper.Companion.toFriendly import com.fsck.k9.mail.Address +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java b/legacy/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java index 8de2b7882c9..5a30ef0fc5a 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java +++ b/legacy/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java @@ -3,7 +3,7 @@ import java.lang.reflect.Array; import java.util.ArrayList; -import app.k9mail.core.android.testing.RobolectricTest; +import net.thunderbird.core.android.testing.RobolectricTest; import app.k9mail.legacy.account.LegacyAccount; import com.fsck.k9.helper.ReplyToParser.ReplyToAddresses; import com.fsck.k9.mail.Address; diff --git a/legacy/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java b/legacy/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java index 6f17b323547..b08481bf16f 100644 --- a/legacy/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java +++ b/legacy/core/src/test/java/com/fsck/k9/mailstore/AttachmentResolverTest.java @@ -5,7 +5,7 @@ import android.net.Uri; -import app.k9mail.core.android.testing.RobolectricTest; +import net.thunderbird.core.android.testing.RobolectricTest; import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.Multipart; import com.fsck.k9.mail.Part; diff --git a/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt index 1176a569f8c..1d84072a0ff 100644 --- a/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt @@ -1,7 +1,6 @@ package com.fsck.k9.message import android.net.Uri -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.Identity import app.k9mail.legacy.account.QuoteStyle import assertk.Assert @@ -10,6 +9,7 @@ import assertk.assertions.contains import assertk.assertions.isGreaterThan import com.fsck.k9.mail.internet.MimeHeaderChecker import com.fsck.k9.mail.internet.TextBody +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test private const val IDENTITY_HEADER = "X-K9mail-Identity" diff --git a/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt index df7aa8d0159..64a38241005 100644 --- a/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt @@ -1,9 +1,9 @@ package com.fsck.k9.message -import app.k9mail.core.android.testing.RobolectricTest import assertk.assertThat import assertk.assertions.contains import com.fsck.k9.helper.toCrLf +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test class IdentityHeaderParserTest : RobolectricTest() { 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 index e90c0f901a1..fd886fb7107 100644 --- a/legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java +++ b/legacy/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; -import app.k9mail.core.android.testing.RobolectricTest; +import net.thunderbird.core.android.testing.RobolectricTest; import app.k9mail.legacy.account.QuoteStyle; import com.fsck.k9.CoreResourceProvider; import app.k9mail.legacy.account.Identity; diff --git a/legacy/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java b/legacy/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java index e076676ca0c..1df8179b937 100644 --- a/legacy/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java +++ b/legacy/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java @@ -4,7 +4,7 @@ import android.net.Uri; import androidx.annotation.Nullable; -import app.k9mail.core.android.testing.RobolectricTest; +import net.thunderbird.core.android.testing.RobolectricTest; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeBodyPart; import com.fsck.k9.mail.internet.MimeHeader; diff --git a/legacy/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt index 340f682a5f2..e31cb78c667 100644 --- a/legacy/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt @@ -1,6 +1,5 @@ package com.fsck.k9.message.quote -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.QuoteStyle import assertk.assertThat import assertk.assertions.isEqualTo @@ -10,6 +9,7 @@ import com.fsck.k9.mail.Message import com.fsck.k9.mail.Message.RecipientType import com.fsck.k9.mail.testing.crlf import java.util.Date +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.kotlin.doReturn import org.mockito.kotlin.eq diff --git a/legacy/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt b/legacy/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt index 932f192ae85..809902fe0f0 100644 --- a/legacy/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt @@ -4,7 +4,7 @@ import assertk.assertThat import assertk.assertions.isEqualTo import com.fsck.k9.message.html.HtmlHelper.extractText import com.fsck.k9.message.signature.HtmlSignatureRemover.Companion.stripSignature -import com.fsck.k9.testing.removeNewlines +import net.thunderbird.core.android.testing.removeNewlines import org.junit.Test class HtmlSignatureRemoverTest { 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 index 87b7b61ad42..e1927a74ffe 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt @@ -5,9 +5,9 @@ import android.app.PendingIntent import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.test.core.app.ApplicationProvider -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount -import com.fsck.k9.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.Mockito.verify import org.mockito.kotlin.any 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 index 430c1a2f4d5..bc0d984ab27 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt @@ -5,9 +5,9 @@ import android.app.PendingIntent import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.test.core.app.ApplicationProvider -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount -import com.fsck.k9.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.Mockito.verify import org.mockito.kotlin.any diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt index a9b42b0aa13..d5032f9c1f2 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt @@ -2,9 +2,9 @@ package com.fsck.k9.notification import androidx.core.app.NotificationCompat import androidx.test.core.app.ApplicationProvider -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount -import com.fsck.k9.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.Mockito.verify import org.mockito.kotlin.any 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 index a8c94e359ba..ee8411991db 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationContentCreatorTest.kt @@ -1,7 +1,6 @@ package com.fsck.k9.notification import app.k9mail.core.android.common.contact.ContactRepository -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount import app.k9mail.legacy.message.controller.MessageReference import app.k9mail.legacy.message.extractors.PreviewResult.PreviewType @@ -10,6 +9,7 @@ import assertk.assertions.isEqualTo import com.fsck.k9.mail.Address import com.fsck.k9.mail.Message.RecipientType import com.fsck.k9.mailstore.LocalMessage +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.kotlin.any import org.mockito.kotlin.doReturn diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt index c341597fbdd..9fb5fc8099c 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt @@ -1,6 +1,5 @@ package com.fsck.k9.notification -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount import app.k9mail.legacy.message.controller.MessageReference import assertk.assertThat @@ -15,6 +14,7 @@ import assertk.assertions.isNull import assertk.assertions.isSameInstanceAs import assertk.assertions.isTrue import kotlin.test.assertNotNull +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test private const val ACCOUNT_UUID = "1-2-3" 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 index 595bdb769db..eb7efea595a 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt @@ -5,9 +5,9 @@ import android.app.PendingIntent import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.test.core.app.ApplicationProvider -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount -import com.fsck.k9.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.ArgumentMatchers.anyLong import org.mockito.Mockito.verify diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt index b7cba226498..f6b7115886c 100644 --- a/legacy/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt @@ -5,11 +5,11 @@ import android.app.PendingIntent import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.test.core.app.ApplicationProvider -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.LegacyAccount import com.fsck.k9.mailstore.LocalFolder import com.fsck.k9.notification.NotificationIds.getFetchingMailNotificationId -import com.fsck.k9.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.MockHelper.mockBuilder +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test import org.mockito.ArgumentMatchers.anyLong import org.mockito.Mockito.verify diff --git a/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt index 52df24f6d19..a508d575ef3 100644 --- a/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsFileParserTest.kt @@ -1,6 +1,5 @@ package com.fsck.k9.preferences -import app.k9mail.core.android.testing.RobolectricTest import assertk.all import assertk.assertThat import assertk.assertions.containsExactly @@ -14,6 +13,7 @@ import com.fsck.k9.preferences.SettingsFile.Account import com.fsck.k9.preferences.SettingsFile.Identity import com.fsck.k9.preferences.SettingsFile.Server import java.util.UUID +import net.thunderbird.core.android.testing.RobolectricTest import org.junit.Test class SettingsFileParserTest : RobolectricTest() { diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt index b0ba01ee39c..98a68a200d9 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt @@ -1,12 +1,12 @@ package com.fsck.k9.activity.compose import android.os.Bundle -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.Identity import assertk.assertThat import assertk.assertions.isFalse import assertk.assertions.isSameInstanceAs import assertk.assertions.isTrue +import com.fsck.k9.RobolectricTest import com.fsck.k9.mail.Address import org.junit.Test import org.mockito.kotlin.doReturn diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt index 1aa20baa8e8..6c302aa4483 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt @@ -1,8 +1,8 @@ package com.fsck.k9.contacts -import app.k9mail.core.android.testing.RobolectricTest import assertk.assertThat import assertk.assertions.isEqualTo +import com.fsck.k9.RobolectricTest import com.fsck.k9.mail.Address import org.junit.Test diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt index d7cf72f7d05..c4e3f24a192 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt @@ -2,10 +2,10 @@ package com.fsck.k9.ui.helper import android.os.Build import android.os.SystemClock -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.core.testing.TestClock import assertk.assertThat import assertk.assertions.isEqualTo +import com.fsck.k9.RobolectricTest import java.time.LocalDate import java.time.LocalDateTime import java.time.ZoneId diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt index df4ff353851..319b2a071d0 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/helper/SizeFormatterTest.kt @@ -1,8 +1,8 @@ package com.fsck.k9.ui.helper -import app.k9mail.core.android.testing.RobolectricTest import assertk.assertThat import assertk.assertions.isEqualTo +import com.fsck.k9.RobolectricTest import org.junit.Test import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt index 2067f4471ad..329cb3cb083 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt @@ -4,7 +4,6 @@ import android.graphics.Color import android.text.Spannable import android.text.style.ForegroundColorSpan import androidx.core.text.getSpans -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.Identity import app.k9mail.legacy.account.LegacyAccount import assertk.assertThat @@ -13,6 +12,7 @@ import assertk.assertions.isEqualTo import assertk.assertions.isInstanceOf import assertk.assertions.isNotNull import assertk.assertions.isNull +import com.fsck.k9.RobolectricTest import com.fsck.k9.helper.ContactNameProvider import com.fsck.k9.mail.Address import org.junit.Test diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt index dd9c83bd11c..ff498d9a761 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt @@ -10,7 +10,6 @@ import android.widget.LinearLayout import androidx.appcompat.app.AppCompatActivity import androidx.core.view.isGone import androidx.core.view.isVisible -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.core.testing.TestClock import app.k9mail.legacy.account.LegacyAccount import assertk.Assert @@ -21,6 +20,7 @@ import assertk.assertions.support.expected import com.fsck.k9.FontSizes import com.fsck.k9.FontSizes.Companion.FONT_DEFAULT import com.fsck.k9.FontSizes.Companion.LARGE +import com.fsck.k9.RobolectricTest import com.fsck.k9.UiDensity import com.fsck.k9.contacts.ContactPictureLoader import com.fsck.k9.mail.Address diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt index d2ef204c563..5e71aeea36c 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt @@ -4,13 +4,13 @@ import android.graphics.Color import android.text.Spannable import android.text.style.ForegroundColorSpan import androidx.core.text.getSpans -import app.k9mail.core.android.testing.RobolectricTest import app.k9mail.legacy.account.Identity import app.k9mail.legacy.account.LegacyAccount import assertk.assertThat import assertk.assertions.containsExactly import assertk.assertions.isEqualTo import assertk.assertions.isInstanceOf +import com.fsck.k9.RobolectricTest import com.fsck.k9.helper.ContactNameProvider import com.fsck.k9.mail.Address import org.junit.Test diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt index 5c2fe4d0deb..e4e5cfaeec7 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt @@ -4,12 +4,12 @@ import android.text.Spannable import android.text.SpannableString import android.text.Spanned import android.text.style.ForegroundColorSpan -import app.k9mail.core.android.testing.RobolectricTest import assertk.Assert import assertk.assertThat import assertk.assertions.isEqualTo import assertk.assertions.isInstanceOf import assertk.assertions.isNull +import com.fsck.k9.RobolectricTest import org.junit.Test private const val COLOR = 0xFF0000 diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/ViewIntentFinderTest.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/ViewIntentFinderTest.kt index 176cb62a330..e2c1903f73b 100644 --- a/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/ViewIntentFinderTest.kt +++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/ViewIntentFinderTest.kt @@ -8,11 +8,11 @@ import android.content.pm.PackageInfo import android.content.pm.ProviderInfo import androidx.core.net.toUri import androidx.test.core.app.ApplicationProvider -import app.k9mail.core.android.testing.RobolectricTest import assertk.all import assertk.assertThat import assertk.assertions.isEqualTo import assertk.assertions.prop +import com.fsck.k9.RobolectricTest import com.fsck.k9.provider.AttachmentTempFileProvider import kotlin.test.Test import org.junit.Before From 8724150d5d405f94311608714e3394dd6691a0b4 Mon Sep 17 00:00:00 2001 From: shamim-emon Date: Mon, 14 Apr 2025 06:29:37 +0600 Subject: [PATCH 2/2] Refactor: Removed dependencies that are no longer needed from :legacy:testing module --- legacy/testing/build.gradle.kts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/legacy/testing/build.gradle.kts b/legacy/testing/build.gradle.kts index 524d4864133..6d5fc353e29 100644 --- a/legacy/testing/build.gradle.kts +++ b/legacy/testing/build.gradle.kts @@ -4,12 +4,6 @@ plugins { dependencies { implementation(projects.legacy.core) - - api(projects.core.android.testing) - - api(libs.koin.core) - api(libs.mockito.core) - api(libs.mockito.kotlin) } android {