wip

Author: DenBond7

FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt

@@ -61,9 +61,7 @@ import jakarta.mail.Session
 import jakarta.mail.internet.MimeMessage
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.hasToString
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
@@ -356,7 +354,7 @@ abstract class BaseTest : BaseActivityTestImplementation {
     intending(
       allOf(
         hasAction(Intent.ACTION_GET_CONTENT),
-        hasCategories(hasItem(Matchers.equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(type)
       )
     ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsFlowTest.kt

@@ -16,6 +16,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasCategories
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -42,8 +43,6 @@ import com.flowcrypt.email.util.DateTimeUtil
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.PrivateKeysManager
 import com.flowcrypt.email.util.TestGeneralUtil
-import org.hamcrest.CoreMatchers
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
 import org.junit.AfterClass
 import org.junit.Rule
@@ -157,7 +156,7 @@ class PublicKeyDetailsFlowTest : BaseTest() {
     intending(
       allOf(
         IntentMatchers.hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        IntentMatchers.hasCategories(CoreMatchers.hasItem(Matchers.equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         IntentMatchers.hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     )

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt

@@ -49,9 +49,7 @@ import jakarta.mail.internet.InternetAddress
 import jakarta.mail.internet.MimeMessage
 import kotlinx.coroutines.runBlocking
 import org.bouncycastle.bcpg.ArmoredInputStream
-import org.hamcrest.CoreMatchers.hasItem
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.equalTo
 import org.junit.Assert.assertArrayEquals
 import org.junit.Rule
 import org.junit.Test
@@ -134,7 +132,7 @@ class PublicKeyDetailsHideArmorMetaFlowTest : BaseTest() {
     intending(
       allOf(
         hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     )

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.kt

@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.base
@@ -17,8 +17,6 @@ import com.flowcrypt.email.Constants
 import com.flowcrypt.email.base.BaseTest
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.hasItem
 import java.io.File
 
 /**
@@ -32,7 +30,7 @@ abstract class BaseBackupKeysFragmentTest : BaseTest(), AddAccountToDatabaseRule
     intending(
       allOf(
         hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt

@@ -42,8 +42,6 @@ import com.flowcrypt.email.util.DateTimeUtil
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.PrivateKeysManager
 import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.hasItem
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -178,7 +176,7 @@ class PrivateKeyDetailsFragmentInIsolationTest : BaseTest() {
     intending(
       allOf(
         hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
         hasType(Constants.MIME_TYPE_PGP_KEY)
       )
     ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))