Rename isSameAs/isNotSameAs to isSameInstanceAs/isNotSameInstanceAs

thunderbird · Jan 3, 2024 · 7a2b600 · 7a2b600
1 parent 612a37c
commit 7a2b600
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 51 deletions.
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
@@ -3,9 +3,9 @@ package com.fsck.k9.mailstore
 import assertk.assertThat
 import assertk.assertions.isFalse
 import assertk.assertions.isNotNull
-import assertk.assertions.isNotSameAs
+import assertk.assertions.isNotSameInstanceAs
 import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import com.fsck.k9.mail.Flag
 import java.util.UUID
@@ -55,7 +55,7 @@ class MessageListCacheTest {
 
         val cache2 = MessageListCache.getCache("u002")
 
-        assertThat(cache2).isNotSameAs(cache)
+        assertThat(cache2).isNotSameInstanceAs(cache)
     }
 
     @Test
@@ -64,7 +64,7 @@ class MessageListCacheTest {
 
         val cache2 = MessageListCache.getCache("u001")
 
-        assertThat(cache2).isSameAs(cache)
+        assertThat(cache2).isSameInstanceAs(cache)
     }
 
     @Test

diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt
@@ -1,7 +1,7 @@
 package com.fsck.k9.mailstore
 
 import assertk.assertThat
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import com.fsck.k9.Account
 import com.fsck.k9.AccountRemovedListener
 import com.fsck.k9.preferences.AccountManager
@@ -26,8 +26,8 @@ class MessageStoreManagerTest {
         val accountManager = mock<AccountManager>()
         val messageStoreManager = MessageStoreManager(accountManager, messageStoreFactory)
 
-        assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore1)
-        assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore1)
+        assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore1)
+        assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore1)
     }
 
     @Test
@@ -38,11 +38,11 @@ class MessageStoreManagerTest {
         }
         val messageStoreManager = MessageStoreManager(accountManager, messageStoreFactory)
 
-        assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore1)
+        assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore1)
 
         listenerCaptor.firstValue.onAccountRemoved(account)
 
-        assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore2)
+        assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore2)
     }
 
     private fun <T : Any> KStubbing<T>.doNothingOn(block: T.() -> Any) {

diff --git a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt
@@ -2,7 +2,7 @@ package com.fsck.k9.message.html
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.Test
 
 class EmailSectionTest {
@@ -47,7 +47,7 @@ class EmailSectionTest {
     fun subSequence() {
         val section = "[ One][ Two][ Three]".asEmailSection()
 
-        assertThat(section.subSequence(0, 11)).isSameAs(section)
+        assertThat(section.subSequence(0, 11)).isSameInstanceAs(section)
         assertThat(section.subSequence(0, 3).asString()).isEqualTo("One")
         assertThat(section.subSequence(0, 2).asString()).isEqualTo("On")
         assertThat(section.subSequence(1, 3).asString()).isEqualTo("ne")
@@ -82,6 +82,7 @@ class EmailSectionTest {
                     isStartOfLine = true
                     spaces = 0
                 }
+
                 ' ' -> if (isStartOfLine) spaces++
                 ']' -> builder.addSegment(spaces, startIndex, index)
                 else -> isStartOfLine = false

diff --git a/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt
@@ -4,7 +4,7 @@ import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import com.fsck.k9.Account
 import com.fsck.k9.Identity
 import com.fsck.k9.K9
@@ -25,7 +25,7 @@ class BaseNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createBaseNotificationData(notificationData)
 
-        assertThat(result.account).isSameAs(account)
+        assertThat(result.account).isSameInstanceAs(account)
     }
 
     @Test

diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
@@ -10,7 +10,7 @@ import assertk.assertions.isFalse
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
 import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import com.fsck.k9.Account
 import com.fsck.k9.controller.MessageReference
@@ -189,12 +189,12 @@ class NotificationDataStoreTest : RobolectricTest() {
         assertNotNull(resultOne)
         assertNotNull(resultTwo)
         assertThat(resultTwo.notificationData.activeNotifications).hasSize(1)
-        assertThat(resultTwo.notificationData.activeNotifications.first().content).isSameAs(content2)
+        assertThat(resultTwo.notificationData.activeNotifications.first().content).isSameInstanceAs(content2)
         assertThat(resultTwo.notificationStoreOperations).isEmpty()
         with(resultTwo.notificationHolder) {
             assertThat(notificationId).isEqualTo(resultOne.notificationHolder.notificationId)
             assertThat(timestamp).isEqualTo(resultOne.notificationHolder.timestamp)
-            assertThat(content).isSameAs(content2)
+            assertThat(content).isSameInstanceAs(content2)
         }
         assertThat(resultTwo.shouldCancelNotification).isFalse()
     }
@@ -226,7 +226,7 @@ class NotificationDataStoreTest : RobolectricTest() {
         val notificationHolder = resultTwo.notificationData.activeNotifications.first { notificationHolder ->
             notificationHolder.content.messageReference == content.messageReference
         }
-        assertThat(notificationHolder.content).isSameAs(content)
+        assertThat(notificationHolder.content).isSameInstanceAs(content)
     }
 
     private fun createAccount(): Account {

diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt b/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt
@@ -6,7 +6,7 @@ import assertk.assertThat
 import assertk.assertions.contains
 import assertk.assertions.containsOnly
 import assertk.assertions.isEmpty
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import com.fsck.k9.preferences.K9StoragePersister.StoragePersistOperationCallback
 import com.fsck.k9.preferences.K9StoragePersister.StoragePersistOperations
@@ -65,7 +65,7 @@ class StoragePersisterTest : K9RobolectricTest() {
 
         assertFailure {
             storagePersister.doInTransaction(operationCallback)
-        }.isSameAs(exception)
+        }.isSameInstanceAs(exception)
 
         val values = storagePersister.loadValues()
 

diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import app.k9mail.core.android.testing.RobolectricTest
 import assertk.assertThat
 import assertk.assertions.isFalse
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import com.fsck.k9.Identity
 import com.fsck.k9.mail.Address
@@ -45,7 +45,7 @@ class ReplyToPresenterTest : RobolectricTest() {
 
         val result = replyToPresenter.getAddresses()
 
-        assertThat(result).isSameAs(addresses)
+        assertThat(result).isSameInstanceAs(addresses)
     }
 
     @Test

diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt
@@ -14,7 +14,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
 import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import com.fsck.k9.Account.QuoteStyle
 import com.fsck.k9.CoreResourceProvider
 import com.fsck.k9.Identity
@@ -272,7 +272,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         verifyNoMoreInteractions(mockCallback)
 
         val pendingIntent = captor.value
-        assertThat(pendingIntent).isSameAs(mockPendingIntent)
+        assertThat(pendingIntent).isSameInstanceAs(mockPendingIntent)
     }
 
     @Test

diff --git a/core/common/src/test/kotlin/app/k9mail/core/common/mail/EmailAddressTest.kt b/core/common/src/test/kotlin/app/k9mail/core/common/mail/EmailAddressTest.kt
@@ -5,7 +5,7 @@ import assertk.assertThat
 import assertk.assertions.containsExactlyInAnyOrder
 import assertk.assertions.isEmpty
 import assertk.assertions.isEqualTo
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import kotlin.test.Test
 
 class EmailAddressTest {
@@ -16,7 +16,7 @@ class EmailAddressTest {
 
         assertThat(emailAddress.localPart).isEqualTo("user")
         assertThat(emailAddress.encodedLocalPart).isEqualTo("user")
-        assertThat(emailAddress.domain).isSameAs(domain)
+        assertThat(emailAddress.domain).isSameInstanceAs(domain)
         assertThat(emailAddress.address).isEqualTo("[email protected]")
         assertThat(emailAddress.normalizedAddress).isEqualTo("[email protected]")
         assertThat(emailAddress.toString()).isEqualTo("[email protected]")

diff --git a/...t/common/src/test/kotlin/app/k9mail/feature/account/common/domain/input/InputFieldTest.kt b/...t/common/src/test/kotlin/app/k9mail/feature/account/common/domain/input/InputFieldTest.kt
@@ -7,9 +7,9 @@ import assertk.all
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
-import assertk.assertions.isNotSameAs
+import assertk.assertions.isNotSameInstanceAs
 import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import assertk.assertions.prop
 import org.junit.Test
@@ -52,7 +52,7 @@ class InputFieldTest(
         val result = initialInput.updateValue(data.updatedValue)
 
         assertThat(result).all {
-            isNotSameAs(initialInput)
+            isNotSameInstanceAs(initialInput)
             hasValue(data.updatedValue)
             hasNoError()
             isNotValid()
@@ -70,7 +70,7 @@ class InputFieldTest(
         val result = initialInput.updateError(TestValidationError)
 
         assertThat(result).all {
-            isNotSameAs(initialInput)
+            isNotSameInstanceAs(initialInput)
             hasValue(data.initialValue)
             hasError(TestValidationError)
             isNotValid()
@@ -88,7 +88,7 @@ class InputFieldTest(
         val result = initialInput.updateValidity(isValid = true)
 
         assertThat(result).all {
-            isNotSameAs(initialInput)
+            isNotSameInstanceAs(initialInput)
             hasValue(data.initialValue)
             hasNoError()
             isValid()
@@ -106,7 +106,7 @@ class InputFieldTest(
         val result = initialInput.updateValidity(isValid = false)
 
         assertThat(result).all {
-            isSameAs(initialInput)
+            isSameInstanceAs(initialInput)
             hasValue(data.initialValue)
             hasError(TestValidationError)
             isNotValid()
@@ -124,7 +124,7 @@ class InputFieldTest(
         val result = initialInput.updateError(TestValidationError2)
 
         assertThat(result).all {
-            isNotSameAs(initialInput)
+            isNotSameInstanceAs(initialInput)
             hasValue(data.initialValue)
             hasError(TestValidationError2)
             isNotValid()
@@ -142,7 +142,7 @@ class InputFieldTest(
         val result = initialInput.updateFromValidationResult(ValidationResult.Success)
 
         assertThat(result).all {
-            isNotSameAs(initialInput)
+            isNotSameInstanceAs(initialInput)
             hasValue(data.initialValue)
             hasNoError()
             isValid()
@@ -160,7 +160,7 @@ class InputFieldTest(
         val result = initialInput.updateFromValidationResult(ValidationResult.Failure(TestValidationError))
 
         assertThat(result).all {
-            isNotSameAs(initialInput)
+            isNotSameInstanceAs(initialInput)
             hasValue(data.initialValue)
             hasError(TestValidationError)
             isNotValid()

diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.kt
@@ -12,7 +12,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
 import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import assertk.assertions.prop
 import com.fsck.k9.mail.filter.FixedLengthInputStream
@@ -370,7 +370,7 @@ class ImapResponseParserTest {
 
         assertFailure {
             parser.readResponse(callback)
-        }.isSameAs(exception)
+        }.isSameInstanceAs(exception)
     }
 
     @Test

diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.kt
@@ -8,7 +8,7 @@ import assertk.assertions.containsExactly
 import assertk.assertions.hasMessage
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
-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.FolderType
@@ -264,7 +264,7 @@ class RealImapStoreTest {
 
         val result = imapStore.getConnection()
 
-        assertThat(result).isSameAs(imapConnection)
+        assertThat(result).isSameInstanceAs(imapConnection)
     }
 
     @Test
@@ -277,8 +277,8 @@ class RealImapStoreTest {
         val resultOne = imapStore.getConnection()
         val resultTwo = imapStore.getConnection()
 
-        assertThat(resultOne).isSameAs(imapConnectionOne)
-        assertThat(resultTwo).isSameAs(imapConnectionTwo)
+        assertThat(resultOne).isSameInstanceAs(imapConnectionOne)
+        assertThat(resultTwo).isSameInstanceAs(imapConnectionTwo)
     }
 
     @Test
@@ -293,7 +293,7 @@ class RealImapStoreTest {
 
         val result = imapStore.getConnection()
 
-        assertThat(result).isSameAs(imapConnection)
+        assertThat(result).isSameInstanceAs(imapConnection)
     }
 
     @Test
@@ -311,7 +311,7 @@ class RealImapStoreTest {
 
         val result = imapStore.getConnection()
 
-        assertThat(result).isSameAs(imapConnectionTwo)
+        assertThat(result).isSameInstanceAs(imapConnectionTwo)
     }
 
     @Test
@@ -330,7 +330,7 @@ class RealImapStoreTest {
 
         val result = imapStore.getConnection()
 
-        assertThat(result).isSameAs(imapConnectionTwo)
+        assertThat(result).isSameInstanceAs(imapConnectionTwo)
     }
 
     @Test
@@ -349,7 +349,7 @@ class RealImapStoreTest {
 
         val result = imapStore.getConnection()
 
-        assertThat(result).isSameAs(imapConnectionTwo)
+        assertThat(result).isSameInstanceAs(imapConnectionTwo)
     }
 
     @Test
@@ -368,7 +368,7 @@ class RealImapStoreTest {
 
         val result = imapStore.getConnection()
 
-        assertThat(result).isSameAs(imapConnectionTwo)
+        assertThat(result).isSameInstanceAs(imapConnectionTwo)
     }
 
     private fun createMockConnection(connectionGeneration: Int = 1): ImapConnection {