From dede9e87e57c3a700afd77e3ec6fab8da5844327 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Aug 2025 05:29:12 +0000 Subject: [PATCH 1/2] Bump the espresso group with 5 updates Bumps the espresso group with 5 updates: | Package | From | To | | --- | --- | --- | | androidx.test.espresso:espresso-core | `3.6.1` | `3.7.0` | | androidx.test.espresso:espresso-contrib | `3.6.1` | `3.7.0` | | androidx.test.espresso:espresso-intents | `3.6.1` | `3.7.0` | | androidx.test.espresso:espresso-web | `3.6.1` | `3.7.0` | | androidx.test.espresso:espresso-idling-resource | `3.6.1` | `3.7.0` | Updates `androidx.test.espresso:espresso-core` from 3.6.1 to 3.7.0 Updates `androidx.test.espresso:espresso-contrib` from 3.6.1 to 3.7.0 Updates `androidx.test.espresso:espresso-intents` from 3.6.1 to 3.7.0 Updates `androidx.test.espresso:espresso-web` from 3.6.1 to 3.7.0 Updates `androidx.test.espresso:espresso-idling-resource` from 3.6.1 to 3.7.0 --- updated-dependencies: - dependency-name: androidx.test.espresso:espresso-core dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: espresso - dependency-name: androidx.test.espresso:espresso-contrib dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: espresso - dependency-name: androidx.test.espresso:espresso-intents dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: espresso - dependency-name: androidx.test.espresso:espresso-web dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: espresso - dependency-name: androidx.test.espresso:espresso-idling-resource dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: espresso ... Signed-off-by: dependabot[bot] --- FlowCrypt/build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 72babc70b..126de2704 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -416,10 +416,10 @@ dependencies { uiTestsImplementation("androidx.fragment:fragment-testing:1.8.7") uiTestsImplementation("androidx.test:core-ktx:1.6.1") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation("androidx.test.espresso:espresso-contrib:3.6.1") - androidTestImplementation("androidx.test.espresso:espresso-intents:3.6.1") - androidTestImplementation("androidx.test.espresso:espresso-web:3.6.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") + androidTestImplementation("androidx.test.espresso:espresso-contrib:3.7.0") + androidTestImplementation("androidx.test.espresso:espresso-intents:3.7.0") + androidTestImplementation("androidx.test.espresso:espresso-web:3.7.0") androidTestImplementation("androidx.test.ext:junit:1.3.0") androidTestImplementation("androidx.test:runner:1.7.0") androidTestImplementation("androidx.test:rules:1.6.1") @@ -453,7 +453,7 @@ dependencies { implementation("androidx.recyclerview:recyclerview:1.4.0") implementation("androidx.recyclerview:recyclerview-selection:1.2.0") implementation("androidx.constraintlayout:constraintlayout:2.2.1") - implementation("androidx.test.espresso:espresso-idling-resource:3.6.1") + implementation("androidx.test.espresso:espresso-idling-resource:3.7.0") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.2") From 20ee1363cb96cec5f9e59ea31d093e355bd6760e Mon Sep 17 00:00:00 2001 From: denbond7 Date: Wed, 27 Aug 2025 10:30:30 +0300 Subject: [PATCH 2/2] wip --- .../androidTest/java/com/flowcrypt/email/base/BaseTest.kt | 4 +--- .../java/com/flowcrypt/email/ui/PublicKeyDetailsFlowTest.kt | 5 ++--- .../email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt | 4 +--- .../flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.kt | 6 ++---- .../incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt | 4 +--- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt index b0334ffa9..a611fd38d 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt +++ b/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)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsFlowTest.kt index 7ec2d0470..0e11859bb 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsFlowTest.kt +++ b/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) ) ) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt index 503cc8d10..284a7df96 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt +++ b/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) ) ) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.kt index f4c98d971..4b260af8f 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.kt +++ b/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)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt index fcda9a11c..e780d465f 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt +++ b/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))