Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a8caa145 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

refactor(message-list): further small improvements

parent 25d76f14

app-common/src/test/kotlin/net/thunderbird/app/common/feature/mail/BaseAccountBackendStorageFactoryTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package net.thunderbird.app.common.feature.mail 
import assertk.assertFailure

import assertk.assertThat

import assertk.assertions.isInstanceOf

import assertk.assertions.isSameAs

import assertk.assertions.isSameInstanceAs

import net.thunderbird.feature.mail.account.api.BaseAccount

import org.junit.Test
@@ -21,7 +21,7 @@ class BaseAccountBackendStorageFactoryTest { 
        factory.createBackendStorage(dto)



        // Assert

        assertThat(legacyFactory.lastAccount).isSameAs(dto)

        assertThat(legacyFactory.lastAccount).isSameInstanceAs(dto)

    }



    @Test
@@ -37,8 +37,8 @@ class BaseAccountBackendStorageFactoryTest { 
        factory.createBackendStorage(domain)



        // Assert

        assertThat(mapper.lastMapped).isSameAs(domain)

        assertThat(legacyFactory.lastAccount).isSameAs(dto)

        assertThat(mapper.lastMapped).isSameInstanceAs(domain)

        assertThat(legacyFactory.lastAccount).isSameInstanceAs(dto)

    }



    @Test

app-common/src/test/kotlin/net/thunderbird/app/common/feature/mail/BaseAccountImapBackendFactoryTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package net.thunderbird.app.common.feature.mail 
import assertk.assertFailure

import assertk.assertThat

import assertk.assertions.isInstanceOf

import assertk.assertions.isSameAs

import assertk.assertions.isSameInstanceAs

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ConnectionSecurity

import com.fsck.k9.mail.ServerSettings
@@ -26,7 +26,7 @@ class BaseAccountImapBackendFactoryTest { 
        factory.createBackend(account)



        // Assert

        assertThat(legacyFactory.lastAccount).isSameAs(account)

        assertThat(legacyFactory.lastAccount).isSameInstanceAs(account)

    }



    @Test
@@ -42,8 +42,8 @@ class BaseAccountImapBackendFactoryTest { 
        factory.createBackend(domain)



        // Assert

        assertThat(mapper.lastMapped).isSameAs(domain)

        assertThat(legacyFactory.lastAccount).isSameAs(dto)

        assertThat(mapper.lastMapped).isSameInstanceAs(domain)

        assertThat(legacyFactory.lastAccount).isSameInstanceAs(dto)

    }



    @Test

app-common/src/test/kotlin/net/thunderbird/app/common/feature/mail/BaseAccountSpecialFolderUpdaterFactoryTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package net.thunderbird.app.common.feature.mail 
import assertk.assertFailure

import assertk.assertThat

import assertk.assertions.isInstanceOf

import assertk.assertions.isSameAs

import assertk.assertions.isSameInstanceAs

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ConnectionSecurity

import com.fsck.k9.mail.ServerSettings
@@ -27,7 +27,7 @@ class BaseAccountSpecialFolderUpdaterFactoryTest { 
        val updater = factory.create(dto)



        // Assert

        assertThat(legacyFactory.lastAccount).isSameAs(dto)

        assertThat(legacyFactory.lastAccount).isSameInstanceAs(dto)

        assertThat(updater).isInstanceOf(SpecialFolderUpdater::class)

    }
@@ -44,8 +44,8 @@ class BaseAccountSpecialFolderUpdaterFactoryTest { 
        factory.create(domain)



        // Assert

        assertThat(mapper.lastMapped).isSameAs(domain)

        assertThat(legacyFactory.lastAccount).isSameAs(dto)

        assertThat(mapper.lastMapped).isSameInstanceAs(domain)

        assertThat(legacyFactory.lastAccount).isSameInstanceAs(dto)

    }



    @Test

app-common/src/test/kotlin/net/thunderbird/app/common/feature/mail/RemoteFolderCreatorResolverTest.kt

+4 −4
Original line number Diff line number Diff line 
package net.thunderbird.app.common.feature.mail



import assertk.assertThat

import assertk.assertions.isNotSameAs

import assertk.assertions.isSameAs

import assertk.assertions.isNotSameInstanceAs

import assertk.assertions.isSameInstanceAs

import kotlin.test.Test

import net.thunderbird.core.common.mail.Protocols
@@ -24,7 +24,7 @@ class RemoteFolderCreatorResolverTest { 
        val result = router.create(account)



        // Assert

        assertThat(result).isNotSameAs(NoOpRemoteFolderCreator)

        assertThat(result).isNotSameInstanceAs(NoOpRemoteFolderCreator)

    }



    @Test
@@ -39,6 +39,6 @@ class RemoteFolderCreatorResolverTest { 
        val result = router.create(account)



        // Assert

        assertThat(result).isSameAs(NoOpRemoteFolderCreator)

        assertThat(result).isSameInstanceAs(NoOpRemoteFolderCreator)

    }

}

core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDtoManager.kt

+3 −4
Original line number Diff line number Diff line
@@ -4,11 +4,10 @@ import kotlinx.coroutines.flow.Flow 
import net.thunderbird.feature.mail.account.api.AccountManager



@Deprecated(

    message = "Use net.thunderbird.feature.mail.account.api.AccountManager<TAccount : BaseAccount> instead",

    message = "Use net.thunderbird.core.android.account.LegacyAccountManager instead",

    replaceWith = ReplaceWith(

        expression = "AccountManager<LegacyAccount>",

        "net.thunderbird.feature.mail.account.api.AccountManager",

        "app.k9mail.legacy.account.LegacyAccount",

        expression = "LegacyAccountManager",

        "net.thunderbird.core.android.account.LegacyAccountManager",

    ),

)

interface LegacyAccountDtoManager : AccountManager<LegacyAccountDto> {