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

Commit c84b9184 authored by cketti's avatar cketti
Browse files

Use assertk's `hasMessage()`

parent 4d143625

feature/account/edit/src/test/kotlin/app/k9mail/feature/account/edit/domain/usecase/GetAccountStateTest.kt

+2 −3
Original line number Original line Diff line number Diff line
@@ -7,9 +7,9 @@ import app.k9mail.feature.account.common.domain.entity.AuthorizationState 
import app.k9mail.feature.account.common.domain.entity.MailConnectionSecurity

import app.k9mail.feature.account.common.domain.entity.MailConnectionSecurity

import assertk.assertFailure

import assertk.assertFailure

import assertk.assertThat

import assertk.assertThat

import assertk.assertions.hasMessage

import assertk.assertions.isEqualTo

import assertk.assertions.isEqualTo

import assertk.assertions.isInstanceOf

import assertk.assertions.isInstanceOf

import assertk.assertions.prop

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ServerSettings

import com.fsck.k9.mail.ServerSettings

import kotlinx.coroutines.test.runTest

import kotlinx.coroutines.test.runTest
@@ -39,8 +39,7 @@ class GetAccountStateTest { 
        assertFailure {

        assertFailure {

            testSubject.execute(ACCOUNT_UUID)

            testSubject.execute(ACCOUNT_UUID)

        }.isInstanceOf<IllegalStateException>()

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .hasMessage("Account state for $ACCOUNT_UUID not found")

            .isEqualTo("Account state for $ACCOUNT_UUID not found")

    }

    }





    private companion object {

    private companion object {

feature/account/edit/src/test/kotlin/app/k9mail/feature/account/edit/domain/usecase/LoadAccountStateTest.kt

+2 −3
Original line number Original line Diff line number Diff line
@@ -7,9 +7,9 @@ import app.k9mail.feature.account.common.domain.entity.AuthorizationState 
import app.k9mail.feature.account.common.domain.entity.MailConnectionSecurity

import app.k9mail.feature.account.common.domain.entity.MailConnectionSecurity

import assertk.assertFailure

import assertk.assertFailure

import assertk.assertThat

import assertk.assertThat

import assertk.assertions.hasMessage

import assertk.assertions.isEqualTo

import assertk.assertions.isEqualTo

import assertk.assertions.isInstanceOf

import assertk.assertions.isInstanceOf

import assertk.assertions.prop

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ServerSettings

import com.fsck.k9.mail.ServerSettings

import kotlinx.coroutines.test.runTest

import kotlinx.coroutines.test.runTest
@@ -43,8 +43,7 @@ class LoadAccountStateTest { 
        assertFailure {

        assertFailure {

            testSubject.execute(ACCOUNT_UUID)

            testSubject.execute(ACCOUNT_UUID)

        }.isInstanceOf<IllegalStateException>()

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .hasMessage("Account state for $ACCOUNT_UUID not found")

            .isEqualTo("Account state for $ACCOUNT_UUID not found")

    }

    }





    private companion object {

    private companion object {

feature/account/edit/src/test/kotlin/app/k9mail/feature/account/edit/domain/usecase/SaveServerSettingsTest.kt

+4 −7
Original line number Original line Diff line number Diff line
@@ -8,9 +8,9 @@ import app.k9mail.feature.account.edit.AccountEditExternalContract.AccountUpdate 
import app.k9mail.feature.account.edit.AccountEditExternalContract.AccountUpdaterResult

import app.k9mail.feature.account.edit.AccountEditExternalContract.AccountUpdaterResult

import assertk.assertFailure

import assertk.assertFailure

import assertk.assertThat

import assertk.assertThat

import assertk.assertions.hasMessage

import assertk.assertions.isEqualTo

import assertk.assertions.isEqualTo

import assertk.assertions.isInstanceOf

import assertk.assertions.isInstanceOf

import assertk.assertions.prop

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ServerSettings

import com.fsck.k9.mail.ServerSettings

import kotlinx.coroutines.test.runTest

import kotlinx.coroutines.test.runTest
@@ -53,8 +53,7 @@ class SaveServerSettingsTest { 
        assertFailure {

        assertFailure {

            testSubject.execute(ACCOUNT_UUID, isIncoming = true)

            testSubject.execute(ACCOUNT_UUID, isIncoming = true)

        }.isInstanceOf<IllegalStateException>()

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .hasMessage("Server settings not found")

            .isEqualTo("Server settings not found")

    }

    }





    @Test

    @Test
@@ -92,8 +91,7 @@ class SaveServerSettingsTest { 
        assertFailure {

        assertFailure {

            testSubject.execute(ACCOUNT_UUID, isIncoming = false)

            testSubject.execute(ACCOUNT_UUID, isIncoming = false)

        }.isInstanceOf<IllegalStateException>()

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .hasMessage("Server settings not found")

            .isEqualTo("Server settings not found")

    }

    }





    @Test

    @Test
@@ -110,8 +108,7 @@ class SaveServerSettingsTest { 
        assertFailure {

        assertFailure {

            testSubject.execute(ACCOUNT_UUID, isIncoming = true)

            testSubject.execute(ACCOUNT_UUID, isIncoming = true)

        }.isInstanceOf<IllegalStateException>()

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .hasMessage("Server settings update failed")

            .isEqualTo("Server settings update failed")

    }

    }





    private companion object {

    private companion object {