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

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

Merge pull request #6769 from thundernest/change_mail_modules_to_assertk 

Change mail modules to assertk
parents 3f8a3ff0 a670406e

mail/common/build.gradle.kts

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ dependencies { 
    // We're only using this for its DefaultHostnameVerifier

    implementation(libs.apache.httpclient5)



    testImplementation(libs.bundles.shared.jvm.test.legacy)

    testImplementation(projects.mail.testing)

    testImplementation(libs.icu4j.charset)

}

mail/common/src/test/java/com/fsck/k9/mail/BoundaryGeneratorTest.kt

+2 −1
Original line number Diff line number Diff line 
package com.fsck.k9.mail



import com.google.common.truth.Truth.assertThat

import assertk.assertThat

import assertk.assertions.isEqualTo

import java.util.Random

import org.junit.Test

import org.mockito.kotlin.mock

mail/common/src/test/java/com/fsck/k9/mail/MessageTest.kt

+2 −1
Original line number Diff line number Diff line 
package com.fsck.k9.mail



import assertk.assertThat

import assertk.assertions.isEqualTo

import com.fsck.k9.mail.internet.BinaryTempFileBody

import com.fsck.k9.mail.internet.BinaryTempFileMessageBody

import com.fsck.k9.mail.internet.MimeBodyPart
@@ -8,7 +10,6 @@ import com.fsck.k9.mail.internet.MimeMessage 
import com.fsck.k9.mail.internet.MimeMessageHelper

import com.fsck.k9.mail.internet.MimeMultipart

import com.fsck.k9.mail.internet.TextBody

import com.google.common.truth.Truth.assertThat

import java.io.ByteArrayOutputStream

import java.io.File

import java.nio.file.Files

mail/common/src/test/java/com/fsck/k9/mail/MimeTypeTest.kt

+12 −7
Original line number Diff line number Diff line 
package com.fsck.k9.mail



import assertk.assertThat

import assertk.assertions.isEqualTo

import assertk.assertions.isFailure

import assertk.assertions.isInstanceOf

import assertk.assertions.isNotNull

import assertk.assertions.isNull

import assertk.assertions.message

import assertk.assertions.startsWith

import com.fsck.k9.mail.MimeType.Companion.toMimeType

import com.fsck.k9.mail.MimeType.Companion.toMimeTypeOrNull

import com.google.common.truth.Truth.assertThat

import org.junit.Assert.fail

import org.junit.Test



class MimeTypeTest {
@@ -63,12 +69,11 @@ class MimeTypeTest { 
    }



    private fun assertInvalidMimeType(input: String) {

        try {

        assertThat {

            input.toMimeType()

            fail("Expected exception")

        } catch (e: IllegalArgumentException) {

            assertThat(e.message).startsWith("Invalid MIME type: ")

        }

        }.isFailure()

            .isInstanceOf(IllegalArgumentException::class)

            .message().isNotNull().startsWith("Invalid MIME type: ")

    }



    private fun assertInvalidMimeTypeReturnsNull(input: String) {

mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.kt

+2 −1
Original line number Diff line number Diff line 
package com.fsck.k9.mail.internet



import assertk.assertThat

import assertk.assertions.isEqualTo

import com.fsck.k9.mail.crlf

import com.google.common.truth.Truth.assertThat

import org.junit.Test



class FlowedMessageUtilsTest {