Issue 1620 UI for send password encrypted msg

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

@@ -22,7 +22,6 @@ import androidx.test.espresso.matcher.RootMatchers.withDecorView
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
 import androidx.test.platform.app.InstrumentationRegistry
 import com.flowcrypt.email.R
@@ -40,7 +39,6 @@ import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Before
-import org.junit.runner.RunWith
 import java.io.InputStream
 import java.util.*
 import javax.mail.Session
@@ -54,7 +52,6 @@ import javax.mail.internet.MimeMessage
  * Time: 16:37
  * E-mail: DenBond7@gmail.com
  */
-@RunWith(AndroidJUnit4::class)
 abstract class BaseTest : BaseActivityTestImplementation {
   val roomDatabase: FlowCryptRoomDatabase = FlowCryptRoomDatabase.getDatabase(getTargetContext())
   private var countingIdlingResource: IdlingResource? = null

FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt

@@ -7,6 +7,7 @@ package com.flowcrypt.email.matchers
 
 import android.view.View
 import android.widget.ListView
+import androidx.annotation.DrawableRes
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Root
 import androidx.test.espresso.matcher.BoundedMatcher
@@ -115,5 +116,12 @@ class CustomMatchers {
     fun isToast(): BaseMatcher<Root?> {
       return ToastMatcher()
     }
+
+    fun withTextViewDrawable(
+      @DrawableRes resourceId: Int,
+      @TextViewDrawableMatcher.DrawablePosition drawablePosition: Int
+    ): Matcher<View> {
+      return TextViewDrawableMatcher(resourceId, drawablePosition)
+    }
   }
 }

FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/TextViewDrawableMatcher.kt

@@ -0,0 +1,57 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.matchers
+
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.IntDef
+import androidx.core.graphics.drawable.toBitmap
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 1/14/22
+ *         Time: 11:55 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+class TextViewDrawableMatcher(
+  @DrawableRes private val resourceId: Int,
+  @DrawablePosition private val drawablePosition: Int
+) : TypeSafeMatcher<View>() {
+  override fun describeTo(description: Description) {
+    description.appendText(
+      "TextView with compound drawable at position $drawablePosition" +
+          " same as drawable with id $resourceId"
+    )
+  }
+
+  override fun matchesSafely(view: View): Boolean {
+    if (view !is TextView) {
+      return false
+    }
+
+    val expectedBitmap = view.context.getDrawable(resourceId)?.toBitmap()
+    return view.compoundDrawables[drawablePosition].toBitmap().sameAs(expectedBitmap)
+  }
+
+  @Retention(AnnotationRetention.SOURCE)
+  @IntDef(
+    DrawablePosition.LEFT,
+    DrawablePosition.TOP,
+    DrawablePosition.RIGHT,
+    DrawablePosition.BOTTOM
+  )
+  annotation class DrawablePosition {
+    companion object {
+      const val LEFT = 0
+      const val TOP = 1
+      const val RIGHT = 2
+      const val BOTTOM = 3
+    }
+  }
+}

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AddOtherAccountFragmentTest.kt

@@ -79,8 +79,8 @@ class AddOtherAccountFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt

@@ -55,9 +55,9 @@ class AttesterSettingsFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(accountRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoKeysTest.kt

@@ -37,9 +37,9 @@ class BackupKeysFragmentNoKeysTest : BaseBackupKeysFragmentTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoPrvBackupOrgRuleTest.kt

@@ -53,9 +53,9 @@ class BackupKeysFragmentNoPrvBackupOrgRuleTest : BaseBackupKeysFragmentTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyPassphraseInRamTest.kt

@@ -51,10 +51,10 @@ class BackupKeysFragmentSingleKeyPassphraseInRamTest : BaseBackupKeysFragmentTes
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyWeakPassphraseTest.kt

@@ -42,7 +42,8 @@ class BackupKeysFragmentSingleKeyWeakPassphraseTest : BaseBackupKeysFragmentTest
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(
       AddPrivateKeyToDatabaseRule(
@@ -52,7 +53,6 @@ class BackupKeysFragmentSingleKeyWeakPassphraseTest : BaseBackupKeysFragmentTest
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTest.kt

@@ -40,10 +40,10 @@ class BackupKeysFragmentTest : BaseBackupKeysFragmentTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphraseInRamTest.kt

@@ -50,7 +50,8 @@ class BackupKeysFragmentTwoKeysDiffPassphraseInRamTest : BaseBackupKeysFragmentT
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
     .around(
@@ -62,7 +63,6 @@ class BackupKeysFragmentTwoKeysDiffPassphraseInRamTest : BaseBackupKeysFragmentT
         passphraseType = KeyEntity.PassphraseType.RAM
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphrasesTest.kt

@@ -43,7 +43,8 @@ class BackupKeysFragmentTwoKeysDiffPassphrasesTest : BaseBackupKeysFragmentTest(
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
     .around(
@@ -54,7 +55,6 @@ class BackupKeysFragmentTwoKeysDiffPassphrasesTest : BaseBackupKeysFragmentTest(
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysSamePassphraseTest.kt

@@ -42,7 +42,8 @@ class BackupKeysFragmentTwoKeysSamePassphraseTest : BaseBackupKeysFragmentTest()
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
     .around(
@@ -53,7 +54,6 @@ class BackupKeysFragmentTwoKeysSamePassphraseTest : BaseBackupKeysFragmentTest()
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ChangePassphraseOfImportedKeysFragmentTest.kt

@@ -55,10 +55,10 @@ class ChangePassphraseOfImportedKeysFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityTestMultiBackups.kt

@@ -52,8 +52,8 @@ class CheckKeysActivityTestMultiBackups : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithExistingKeysTest.kt

@@ -65,7 +65,8 @@ class CheckKeysActivityWithExistingKeysTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(
       AddPrivateKeyToDatabaseRule(
@@ -75,7 +76,6 @@ class CheckKeysActivityWithExistingKeysTest : BaseTest() {
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithoutExistingKeysTest.kt

@@ -61,8 +61,8 @@ class CheckKeysActivityWithoutExistingKeysTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckPassphraseStrengthFragmentTest.kt

@@ -33,7 +33,6 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
-import java.util.Locale
 
 /**
  * @author Denis Bondarenko
@@ -58,10 +57,10 @@ class CheckPassphraseStrengthFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
@@ -105,7 +104,7 @@ class CheckPassphraseStrengthFragmentTest : BaseTest() {
         .check(matches(isDisplayed()))
         .perform(replaceText(passPhrases[i]))
       onView(withId(R.id.tVPassphraseQuality))
-        .check(matches(withText(startsWith(degreeOfReliabilityOfPassPhrase[i].toUpperCase(Locale.getDefault())))))
+        .check(matches(withText(startsWith(degreeOfReliabilityOfPassPhrase[i].uppercase()))))
       onView(withId(R.id.eTPassphrase))
         .check(matches(isDisplayed()))
         .perform(clearText())

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyAllTest.kt

@@ -56,10 +56,10 @@ class CreateMessageActivityReplyAllTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule(account))
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyTest.kt

@@ -46,10 +46,10 @@ class CreateMessageActivityReplyTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt

@@ -30,6 +30,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
@@ -103,11 +104,11 @@ class CreateMessageActivityTest : BaseCreateMessageActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
     .around(temporaryFolderRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
@@ -728,7 +729,7 @@ class CreateMessageActivityTest : BaseCreateMessageActivityTest() {
   private fun deleteAtt(att: File) {
     onView(
       allOf(
-        withId(R.id.imageButtonClearAtt), ViewMatchers.withParent(
+        withId(R.id.imageButtonClearAtt), withParent(
           allOf(withId(R.id.actionButtons), hasSibling(withText(att.name)))
         )
       )