Skip to content

Commit d42e0d5

Browse files
DenBond7DenBond7
committed
wip
1 parent 2a3c585 commit d42e0d5

15 files changed

Lines changed: 25 additions & 32 deletions

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/SendMsgTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import com.flowcrypt.email.security.pgp.PgpDecryptAndOrVerify
3535
import com.flowcrypt.email.security.pgp.PgpKey
3636
import com.flowcrypt.email.util.AccountDaoManager
3737
import com.flowcrypt.email.util.PrivateKeysManager
38-
import org.eclipse.angus.mail.imap.IMAPFolder
3938
import jakarta.mail.Flags
4039
import jakarta.mail.Folder
4140
import jakarta.mail.Message
@@ -52,8 +51,9 @@ import kotlinx.coroutines.runBlocking
5251
import kotlinx.coroutines.withContext
5352
import org.bouncycastle.openpgp.PGPSecretKeyRing
5453
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
55-
import org.hamcrest.CoreMatchers.`is`
54+
import org.eclipse.angus.mail.imap.IMAPFolder
5655
import org.hamcrest.MatcherAssert.assertThat
56+
import org.hamcrest.Matchers.`is`
5757
import org.junit.Assert.assertArrayEquals
5858
import org.junit.Assert.assertEquals
5959
import org.junit.Assert.assertFalse

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/ToolBarTitleMatcher.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
3-
* Contributors: DenBond7
3+
* Contributors: denbond7
44
*/
55

66
package com.flowcrypt.email.matchers
@@ -9,9 +9,9 @@ import android.view.View
99
import androidx.appcompat.widget.Toolbar
1010
import androidx.test.espresso.matcher.BoundedMatcher
1111
import com.google.android.gms.common.internal.Preconditions.checkNotNull
12-
import org.hamcrest.CoreMatchers.`is`
1312
import org.hamcrest.Description
1413
import org.hamcrest.Matcher
14+
import org.hamcrest.Matchers.`is`
1515

1616
/**
1717
* @author Denys Bondarenko

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AddOtherAccountFlowTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import com.flowcrypt.email.ui.activity.MainActivity
2929
import com.flowcrypt.email.ui.base.AddOtherAccountBaseTest
3030
import com.flowcrypt.email.util.AuthCredentialsManager
3131
import com.flowcrypt.email.util.TestGeneralUtil
32-
import org.hamcrest.CoreMatchers.anyOf
33-
import org.hamcrest.CoreMatchers.startsWith
32+
import org.hamcrest.Matchers.anyOf
33+
import org.hamcrest.Matchers.startsWith
3434
import org.junit.Rule
3535
import org.junit.Test
3636
import org.junit.rules.RuleChain

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
/*
22
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
3-
* Contributors: DenBond7
3+
* Contributors: denbond7
44
*/
55

66
package com.flowcrypt.email.ui
77

88
import androidx.test.espresso.Espresso.onView
99
import androidx.test.espresso.action.ViewActions.click
1010
import androidx.test.espresso.assertion.ViewAssertions.matches
11-
import androidx.test.espresso.matcher.ViewMatchers.hasTextColor
1211
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
1312
import androidx.test.espresso.matcher.ViewMatchers.withId
14-
import androidx.test.espresso.matcher.ViewMatchers.withText
1513
import androidx.test.ext.junit.runners.AndroidJUnit4
1614
import androidx.test.filters.FlakyTest
1715
import androidx.test.filters.MediumTest
1816
import com.flowcrypt.email.R
19-
import com.flowcrypt.email.TestConstants
20-
import com.flowcrypt.email.extensions.kotlin.asInternetAddress
2117
import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
2218
import com.flowcrypt.email.junit.annotations.NotReadyForCI
2319
import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
@@ -26,10 +22,8 @@ import com.flowcrypt.email.rules.GrantPermissionRuleChooser
2622
import com.flowcrypt.email.rules.RetryRule
2723
import com.flowcrypt.email.rules.ScreenshotTestRule
2824
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
29-
import org.hamcrest.CoreMatchers.not
3025
import org.junit.Rule
3126
import org.junit.Test
32-
import org.junit.Ignore
3327
import org.junit.rules.RuleChain
3428
import org.junit.rules.TestRule
3529
import org.junit.runner.RunWith

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ImportRecipientsFromSourceFragmentFlowTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.flowcrypt.email.util.TestGeneralUtil
3333
import okhttp3.mockwebserver.Dispatcher
3434
import okhttp3.mockwebserver.MockResponse
3535
import okhttp3.mockwebserver.RecordedRequest
36-
import org.hamcrest.CoreMatchers.containsString
36+
import org.hamcrest.Matchers.containsString
3737
import org.junit.After
3838
import org.junit.Before
3939
import org.junit.Rule

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UseFesAfterSetupDuringRefreshingClientConfigurationTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import kotlinx.coroutines.runBlocking
2929
import okhttp3.mockwebserver.Dispatcher
3030
import okhttp3.mockwebserver.MockResponse
3131
import okhttp3.mockwebserver.RecordedRequest
32-
import org.hamcrest.CoreMatchers.`is`
3332
import org.hamcrest.MatcherAssert.assertThat
33+
import org.hamcrest.Matchers.`is`
3434
import org.junit.Assert.assertArrayEquals
3535
import org.junit.Assert.assertEquals
3636
import org.junit.Rule

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
3-
* Contributors: DenBond7
3+
* Contributors: denbond7
44
*/
55

66
package com.flowcrypt.email.ui.base
@@ -20,9 +20,9 @@ import com.flowcrypt.email.api.email.model.AuthCredentials
2020
import com.flowcrypt.email.api.email.model.SecurityType
2121
import com.flowcrypt.email.base.BaseTest
2222
import com.flowcrypt.email.matchers.CustomMatchers.Companion.withSecurityTypeOption
23-
import org.hamcrest.CoreMatchers.`is`
24-
import org.hamcrest.CoreMatchers.allOf
25-
import org.hamcrest.CoreMatchers.instanceOf
23+
import org.hamcrest.Matchers.allOf
24+
import org.hamcrest.Matchers.instanceOf
25+
import org.hamcrest.Matchers.`is`
2626

2727
/**
2828
* @author Denys Bondarenko

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ import okhttp3.mockwebserver.MockResponse
4747
import okhttp3.mockwebserver.RecordedRequest
4848
import org.bouncycastle.openpgp.PGPSecretKeyRing
4949
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
50-
import org.hamcrest.CoreMatchers.allOf
51-
import org.hamcrest.CoreMatchers.not
50+
import org.hamcrest.Matchers.allOf
51+
import org.hamcrest.Matchers.not
5252
import org.junit.Assert.assertArrayEquals
5353
import org.junit.Assert.assertEquals
5454
import org.junit.Assert.assertFalse

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.flowcrypt.email.util.TestGeneralUtil
2020
import okhttp3.mockwebserver.Dispatcher
2121
import okhttp3.mockwebserver.MockResponse
2222
import okhttp3.mockwebserver.RecordedRequest
23-
import org.hamcrest.CoreMatchers
23+
import org.hamcrest.Matchers.not
2424
import org.junit.ClassRule
2525
import java.net.HttpURLConnection
2626

@@ -69,7 +69,7 @@ abstract class BaseComposeScreenNoKeyAvailableTest : BaseComposeScreenTest() {
6969
//check that editTextFrom doesn't have gray text color. It means a sender has a private key.
7070
onView(withId(R.id.editTextFrom))
7171
.check(matches(isDisplayed()))
72-
.check(matches(CoreMatchers.not(hasTextColor(R.color.gray))))
72+
.check(matches(not(hasTextColor(R.color.gray))))
7373
}
7474

7575
companion object {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
3-
* Contributors: DenBond7
3+
* Contributors: denbond7
44
*/
55

66
package com.flowcrypt.email.ui.fragment.isolation.incontainer
@@ -23,7 +23,7 @@ import com.flowcrypt.email.rules.ScreenshotTestRule
2323
import com.flowcrypt.email.ui.activity.fragment.BackupKeysFragment
2424
import com.flowcrypt.email.ui.base.BaseBackupKeysFragmentTest
2525
import com.flowcrypt.email.util.TestGeneralUtil
26-
import org.hamcrest.CoreMatchers.not
26+
import org.hamcrest.Matchers.not
2727
import org.junit.Before
2828
import org.junit.Rule
2929
import org.junit.Test

0 commit comments

Comments
 (0)