Merge pull request #7126 from thundernest/refactor_assertk_usage (bffddf25) · Commits · e / os / Mail

feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/AutoDiscoveryMapperKtTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ class AutoDiscoveryMapperKtTest {
		fun `should throw error when IncomingServerSettings not known`() {
		val incomingServerSettings = object : IncomingServerSettings {}

		assertFailsWith(IllegalArgumentException::class) {
		assertFailsWith<IllegalArgumentException> {
		incomingServerSettings.toServerSettings("password")
		}
		}
		@@ -87,7 +87,7 @@ class AutoDiscoveryMapperKtTest {
		fun `should throw error when OutgoingServerSettings not known`() {
		val outgoingServerSettings = object : OutgoingServerSettings {}

		assertFailsWith(IllegalArgumentException::class) {
		assertFailsWith<IllegalArgumentException> {
		outgoingServerSettings.toServerSettings("password")
		}
		}

feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/entity/IncomingProtocolTypeTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ class IncomingProtocolTypeTest {

		@Test
		fun `fromName should throw IllegalArgumentException`() {
		assertFailsWith(IllegalArgumentException::class) { IncomingProtocolType.fromName("unknown") }
		assertFailsWith<IllegalArgumentException> { IncomingProtocolType.fromName("unknown") }
		}

		@Test

feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/usecase/GetAutoDiscoveryTest.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ class GetAutoDiscoveryTest {
		val result = useCase.execute("user@example.com")

		assertThat(result)
		.isInstanceOf(AutoDiscoveryResult.Settings::class)
		.isInstanceOf<AutoDiscoveryResult.Settings>()
		.isEqualTo(SETTINGS_WITH_PASSWORD)
		}

		@@ -44,7 +44,7 @@ class GetAutoDiscoveryTest {
		val result = useCase.execute("user@example.com")

		assertThat(result)
		.isInstanceOf(AutoDiscoveryResult.NoUsableSettingsFound::class)
		.isInstanceOf<AutoDiscoveryResult.NoUsableSettingsFound>()
		}

		@Test
		@@ -57,7 +57,7 @@ class GetAutoDiscoveryTest {
		val result = useCase.execute("user@example.com")

		assertThat(result)
		.isInstanceOf(AutoDiscoveryResult.NoUsableSettingsFound::class)
		.isInstanceOf<AutoDiscoveryResult.NoUsableSettingsFound>()
		}

		@Test
		@@ -71,7 +71,7 @@ class GetAutoDiscoveryTest {
		val result = useCase.execute("user@example.com")

		assertThat(result)
		.isInstanceOf(AutoDiscoveryResult.UnexpectedException::class)
		.isInstanceOf<AutoDiscoveryResult.UnexpectedException>()
		.isEqualTo(autoDiscoveryResult)
		}

		@@ -85,7 +85,7 @@ class GetAutoDiscoveryTest {
		val result = useCase.execute("user@example.com")

		assertThat(result)
		.isInstanceOf(AutoDiscoveryResult.Settings::class)
		.isInstanceOf<AutoDiscoveryResult.Settings>()
		.isEqualTo(SETTINGS_WITH_OAUTH)
		}

		@@ -99,7 +99,7 @@ class GetAutoDiscoveryTest {
		val result = useCase.execute("user@example.com")

		assertThat(result)
		.isInstanceOf(AutoDiscoveryResult.Settings::class)
		.isInstanceOf<AutoDiscoveryResult.Settings>()
		.isEqualTo(
		SETTINGS_WITH_OAUTH.copy(
		incomingServerSettings = (SETTINGS_WITH_OAUTH.incomingServerSettings as ImapServerSettings).copy(

feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/usecase/ValidateAccountNameTest.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,22 +15,22 @@ class ValidateAccountNameTest {
		fun `should succeed when account name is set`() {
		val result = testSubject.execute("account name")

		assertThat(result).isInstanceOf(ValidationResult.Success::class)
		assertThat(result).isInstanceOf<ValidationResult.Success>()
		}

		@Test
		fun `should succeed when account name is empty`() {
		val result = testSubject.execute("")

		assertThat(result).isInstanceOf(ValidationResult.Success::class)
		assertThat(result).isInstanceOf<ValidationResult.Success>()
		}

		@Test
		fun `should fail when account name is blank`() {
		val result = testSubject.execute(" ")

		assertThat(result).isInstanceOf(ValidationResult.Failure::class)
		assertThat(result).isInstanceOf<ValidationResult.Failure>()
		.prop(ValidationResult.Failure::error)
		.isInstanceOf(ValidateAccountNameError.BlankAccountName::class)
		.isInstanceOf<ValidateAccountNameError.BlankAccountName>()
		}
		}

feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/domain/usecase/ValidateConfigurationApprovalTest.kt

+12 −12

Original line number	Diff line number	Diff line
		@@ -14,63 +14,63 @@ class ValidateConfigurationApprovalTest {
		fun `should succeed when auto discovery is approved and trusted`() {
		val result = testSubject.execute(isApproved = true, isAutoDiscoveryTrusted = true)

		assertThat(result).isInstanceOf(ValidationResult.Success::class)
		assertThat(result).isInstanceOf<ValidationResult.Success>()
		}

		@Test
		fun `should succeed when auto discovery not approved but is trusted`() {
		val result = testSubject.execute(isApproved = false, isAutoDiscoveryTrusted = true)

		assertThat(result).isInstanceOf(ValidationResult.Success::class)
		assertThat(result).isInstanceOf<ValidationResult.Success>()
		}

		@Test
		fun `should succeed when auto discovery is approved but not trusted`() {
		val result = testSubject.execute(isApproved = true, isAutoDiscoveryTrusted = false)

		assertThat(result).isInstanceOf(ValidationResult.Success::class)
		assertThat(result).isInstanceOf<ValidationResult.Success>()
		}

		@Test
		fun `should fail when auto discovery is not approved and not trusted`() {
		val result = testSubject.execute(isApproved = false, isAutoDiscoveryTrusted = false)

		assertThat(result).isInstanceOf(ValidationResult.Failure::class)
		assertThat(result).isInstanceOf<ValidationResult.Failure>()
		.prop(ValidationResult.Failure::error)
		.isInstanceOf(ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired::class)
		.isInstanceOf<ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired>()
		}

		@Test
		fun `should succeed when auto discovery isApproved null and is trusted`() {
		val result = testSubject.execute(isApproved = null, isAutoDiscoveryTrusted = true)

		assertThat(result).isInstanceOf(ValidationResult.Success::class)
		assertThat(result).isInstanceOf<ValidationResult.Success>()
		}

		@Test
		fun `should fail when auto discovery is isApproved null and is not trusted`() {
		val result = testSubject.execute(isApproved = null, isAutoDiscoveryTrusted = false)

		assertThat(result).isInstanceOf(ValidationResult.Failure::class)
		assertThat(result).isInstanceOf<ValidationResult.Failure>()
		.prop(ValidationResult.Failure::error)
		.isInstanceOf(ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired::class)
		.isInstanceOf<ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired>()
		}

		@Test
		fun `should fail when auto discovery is approved and trusted is null`() {
		val result = testSubject.execute(isApproved = false, isAutoDiscoveryTrusted = null)

		assertThat(result).isInstanceOf(ValidationResult.Failure::class)
		assertThat(result).isInstanceOf<ValidationResult.Failure>()
		.prop(ValidationResult.Failure::error)
		.isInstanceOf(ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired::class)
		.isInstanceOf<ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired>()
		}

		@Test
		fun `should fail when auto discovery is not approved and trusted is null`() {
		val result = testSubject.execute(isApproved = false, isAutoDiscoveryTrusted = null)

		assertThat(result).isInstanceOf(ValidationResult.Failure::class)
		assertThat(result).isInstanceOf<ValidationResult.Failure>()
		.prop(ValidationResult.Failure::error)
		.isInstanceOf(ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired::class)
		.isInstanceOf<ValidateConfigurationApproval.ValidateConfigurationApprovalError.ApprovalRequired>()
		}
		}