Skip to content

Commit 493ff89

Browse files
committed
Refactor: move :legacy:testing.preferences to core:android:testing.preferences
1 parent a1130bd commit 493ff89

18 files changed

Lines changed: 27 additions & 35 deletions

File tree

legacy/testing/src/main/java/com/fsck/k9/preferences/InMemoryStoragePersister.kt renamed to core/android/testing/src/main/kotlin/net/thunderbird/core/android/preferences/InMemoryStoragePersister.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
package com.fsck.k9.preferences
1+
package net.thunderbird.core.android.preferences
2+
3+
import com.fsck.k9.preferences.Storage
4+
import com.fsck.k9.preferences.StorageEditor
5+
import com.fsck.k9.preferences.StoragePersister
6+
import com.fsck.k9.preferences.StorageUpdater
27

38
class InMemoryStoragePersister : StoragePersister {
49
private val values = mutableMapOf<String, Any?>()

legacy/core/src/test/java/com/fsck/k9/PreferencesTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import assertk.assertions.isSameInstanceAs
77
import com.fsck.k9.mail.AuthType
88
import com.fsck.k9.mail.ConnectionSecurity
99
import com.fsck.k9.mail.ServerSettings
10-
import com.fsck.k9.preferences.InMemoryStoragePersister
1110
import kotlin.test.Test
11+
import net.thunderbird.core.android.preferences.InMemoryStoragePersister
1212
import org.junit.Before
1313
import org.mockito.kotlin.any
1414
import org.mockito.kotlin.doReturn

legacy/core/src/test/java/com/fsck/k9/TestApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import com.fsck.k9.crypto.EncryptionExtractor
1414
import com.fsck.k9.notification.NotificationActionCreator
1515
import com.fsck.k9.notification.NotificationResourceProvider
1616
import com.fsck.k9.notification.NotificationStrategy
17-
import com.fsck.k9.preferences.InMemoryStoragePersister
1817
import com.fsck.k9.preferences.StoragePersister
1918
import com.fsck.k9.storage.storageModule
19+
import net.thunderbird.core.android.preferences.InMemoryStoragePersister
2020
import net.thunderbird.legacy.core.FakeAccountDefaultsProvider
2121
import org.koin.core.qualifier.named
2222
import org.koin.dsl.module

legacy/testing/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ plugins {
33
}
44

55
dependencies {
6+
67
implementation(projects.legacy.core)
8+
api(projects.core.android.testing)
9+
10+
api(libs.koin.core)
11+
api(libs.mockito.core)
12+
api(libs.mockito.kotlin)
713
}
814

915
android {

legacy/ui/legacy/src/test/java/com/fsck/k9/RobolectricTest.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import app.k9mail.core.featureflag.InMemoryFeatureFlagProvider
77
import app.k9mail.feature.telemetry.telemetryModule
88
import app.k9mail.legacy.account.AccountDefaultsProvider
99
import app.k9mail.legacy.di.DI
10-
import com.fsck.k9.preferences.InMemoryStoragePersister
1110
import com.fsck.k9.preferences.StoragePersister
11+
import net.thunderbird.core.android.preferences.InMemoryStoragePersister
1212
import org.koin.dsl.module
1313
import org.mockito.Mockito.mock
1414

legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
import android.net.Uri;
1212
import android.provider.ContactsContract;
1313
import android.provider.ContactsContract.CommonDataKinds.Email;
14-
15-
import com.fsck.k9.RobolectricTest;
1614
import com.fsck.k9.mail.Address;
1715
import com.fsck.k9.view.RecipientSelectView.Recipient;
1816
import com.fsck.k9.view.RecipientSelectView.RecipientCryptoStatus;
17+
import net.thunderbird.core.android.testing.RobolectricTest;
1918
import org.junit.Before;
2019
import org.junit.Test;
2120
import org.robolectric.RuntimeEnvironment;

legacy/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import assertk.assertThat
66
import assertk.assertions.isFalse
77
import assertk.assertions.isSameInstanceAs
88
import assertk.assertions.isTrue
9-
import com.fsck.k9.RobolectricTest
109
import com.fsck.k9.mail.Address
10+
import net.thunderbird.core.android.testing.RobolectricTest
1111
import org.junit.Test
1212
import org.mockito.kotlin.doReturn
1313
import org.mockito.kotlin.mock

legacy/ui/legacy/src/test/java/com/fsck/k9/contacts/ContactLetterExtractorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.fsck.k9.contacts
22

33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
5-
import com.fsck.k9.RobolectricTest
65
import com.fsck.k9.mail.Address
6+
import net.thunderbird.core.android.testing.RobolectricTest
77
import org.junit.Test
88

99
class ContactLetterExtractorTest : RobolectricTest() {

legacy/ui/legacy/src/test/java/com/fsck/k9/ui/compose/RecipientTokenLayoutTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import androidx.appcompat.app.AppCompatActivity
77
import androidx.core.view.isVisible
88
import assertk.assertThat
99
import assertk.assertions.isEqualTo
10-
import com.fsck.k9.RobolectricTest
1110
import com.fsck.k9.ui.R
1211
import com.google.android.material.textview.MaterialTextView
12+
import net.thunderbird.core.android.testing.RobolectricTest
1313
import org.junit.Before
1414
import org.junit.Test
1515
import org.robolectric.Robolectric

0 commit comments

Comments
 (0)