Merge pull request #9061 from shamim-emon/move-legacy-testing-testing-to-core-module

Move :legacy:testing.testing to core module

Author: kewisch

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

…n/java/com/fsck/k9/testing/MockHelper.kt …rbird/core/android/testing/MockHelper.ktlegacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt renamed to core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/MockHelper.kt legacy/testing/src/main/java/com/fsck/k9/testing/MockHelper.kt renamed to 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/RobolectricTest.kt …/core/android/testing/RobolectricTest.ktcore/android/testing/src/main/kotlin/app/k9mail/core/android/testing/RobolectricTest.kt renamed to core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/RobolectricTest.kt core/android/testing/src/main/kotlin/app/k9mail/core/android/testing/RobolectricTest.kt renamed to 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

…/com/fsck/k9/testing/StringExtensions.kt …core/android/testing/StringExtensions.ktlegacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt renamed to core/android/testing/src/main/kotlin/net/thunderbird/core/android/testing/StringExtensions.kt legacy/testing/src/main/java/com/fsck/k9/testing/StringExtensions.kt renamed to 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() {