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

Unverified Commit d5af852c authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #7290 from thundernest/clean_up_tests 

Use assertk's `hasMessage()`
parents 64902801 c84b9184

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

+2 −3
Original line number 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 assertk.assertFailure

import assertk.assertThat

import assertk.assertions.hasMessage

import assertk.assertions.isEqualTo

import assertk.assertions.isInstanceOf

import assertk.assertions.prop

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ServerSettings

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

            testSubject.execute(ACCOUNT_UUID)

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

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

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

    }



    private companion object {

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

+2 −3
Original line number 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 assertk.assertFailure

import assertk.assertThat

import assertk.assertions.hasMessage

import assertk.assertions.isEqualTo

import assertk.assertions.isInstanceOf

import assertk.assertions.prop

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ServerSettings

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

            testSubject.execute(ACCOUNT_UUID)

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

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

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

    }



    private companion object {

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

+4 −7
Original line number 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 assertk.assertFailure

import assertk.assertThat

import assertk.assertions.hasMessage

import assertk.assertions.isEqualTo

import assertk.assertions.isInstanceOf

import assertk.assertions.prop

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ServerSettings

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

            testSubject.execute(ACCOUNT_UUID, isIncoming = true)

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .isEqualTo("Server settings not found")

            .hasMessage("Server settings not found")

    }



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

            testSubject.execute(ACCOUNT_UUID, isIncoming = false)

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .isEqualTo("Server settings not found")

            .hasMessage("Server settings not found")

    }



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

            testSubject.execute(ACCOUNT_UUID, isIncoming = true)

        }.isInstanceOf<IllegalStateException>()

            .prop(IllegalStateException::message)

            .isEqualTo("Server settings update failed")

            .hasMessage("Server settings update failed")

    }



    private companion object {