Move :legacy:testing.testing to core module

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)
 }

legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt → 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

core/android/testing/src/main/kotlin/app/k9mail/core/android/testing/RobolectricTest.kt → 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

legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt → 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(), "")

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() {

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;

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() {

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;

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() {

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() {

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

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;

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;

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"

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() {

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;

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;

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

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 {

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

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

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

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

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"

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

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

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() {

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 {

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

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
 

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

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

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