Added ReadyForCIAndFlakyFilter.| #2642

Author: DenBond7

FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/ReadyForCIAndFlakyFilter.kt

@@ -0,0 +1,24 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.junit.filters
+
+import androidx.test.filters.FlakyTest
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
+import org.junit.runner.Description
+
+/**
+ * @author Denys Bondarenko
+ */
+open class ReadyForCIAndFlakyFilter : BaseCustomFilter() {
+  override fun evaluateTest(description: Description?): Boolean {
+    val annotationClass = NotReadyForCI::class.java
+    val annotationClassFlakyTest = FlakyTest::class.java
+    return !isAnnotationPresentAtClassOrMethod(description, annotationClass)
+        && isAnnotationPresentAtClassOrMethod(description, annotationClassFlakyTest)
+  }
+
+  override fun describe() = "Filter flaky tests that are ready to be run on a CI server"
+}

FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/ReadyForCIAndNonFlakyFilter.kt

@@ -20,5 +20,5 @@ open class ReadyForCIAndNonFlakyFilter : BaseCustomFilter() {
         && !isAnnotationPresentAtClassOrMethod(description, annotationClassFlakyTest)
   }
 
-  override fun describe() = "Filter tests that are ready to be run on a CI server"
+  override fun describe() = "Filter not flaky tests that are ready to be run on a CI server"
 }

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

@@ -21,6 +21,7 @@ import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.KeyEntity
 import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withDrawable
 import com.flowcrypt.email.model.KeyImportDetails
 import com.flowcrypt.email.rules.AddAccountToDatabaseRule
@@ -42,7 +43,6 @@ import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 import org.hamcrest.Matchers.not
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -155,6 +155,7 @@ class AttachmentDownloadingProgressFlowTest : BaseMessageDetailsFlowTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testVisibilityOfDownloadingProgressIcon() {
     baseCheckWithAtt(
       incomingMsgInfo = getMsgInfo(

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

@@ -24,6 +24,7 @@ import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.database.entity.KeyEntity
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
 import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.GrantPermissionRuleChooser
@@ -61,6 +62,7 @@ class ComposeScreenNoKeyAvailableCreateNewKeyFlowTest : BaseComposeScreenNoKeyAv
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testCreatingNewKey() {
     doBaseActions {
       onView(withText(R.string.create_a_new_key))

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

@@ -19,6 +19,7 @@ import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.extensions.kotlin.asInternetAddress
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
 import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.GrantPermissionRuleChooser
@@ -62,6 +63,7 @@ class ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest :
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testAddEmailToExistingKey() {
     doTestAddEmailToExistingKey {
       waitForObjectWithText(getResString(android.R.string.ok), 2000)

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

@@ -20,6 +20,7 @@ import androidx.test.filters.MediumTest
 import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
 import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.GrantPermissionRuleChooser
@@ -60,6 +61,7 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest : Bas
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testImportKey() {
     doBaseActions {
       addTextToClipboard("private key", requireNotNull(pgpKeyDetails.privateKey))

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

@@ -18,6 +18,7 @@ import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.database.entity.KeyEntity
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
 import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.GrantPermissionRuleChooser
@@ -55,6 +56,7 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest : BaseComp
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testAddEmailToExistingKey() {
     doTestAddEmailToExistingKey {
       onView(withId(R.id.buttonOk))

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

@@ -29,6 +29,7 @@ import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.base.BaseTest
 import com.flowcrypt.email.database.entity.KeyEntity
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.model.KeyImportDetails
 import com.flowcrypt.email.rules.AddAccountToDatabaseRule
 import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
@@ -90,6 +91,7 @@ class EndPassPhraseSessionFlowTest : BaseTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testEndPassPhraseSessionButton() {
     //as tests run a bit differently need to run PassPhrasesInRAMService manually at this stage
     PassPhrasesInRAMService.start(getTargetContext())

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

@@ -299,6 +299,7 @@ class MainSignInFragmentFlowTest : BaseSignTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testFailAttesterSubmit() {
     setupAndClickSignInButton(genMockGoogleSignInAccountJson(EMAIL_FES_ENFORCE_ATTESTER_SUBMIT))
     unregisterCountingIdlingResource()

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

@@ -53,6 +53,7 @@ import com.flowcrypt.email.api.retrofit.response.model.GenericMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.InlineAttMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.PublicKeyMsgBlock
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withEmptyRecyclerView
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withRecyclerViewItemCount
 import com.flowcrypt.email.model.KeyImportDetails
@@ -217,6 +218,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testDecryptionError_KEY_MISMATCH_MissingKeyErrorImportKey() {
     testMissingKey(
       getMsgInfo(
@@ -267,6 +269,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testDecryptionError_FORMAT_BadlyFormattedMsg() {
     val msgInfo = getMsgInfo(
       path = "messages/info/encrypted_msg_info_text_error_badly_formatted.json",
@@ -297,6 +300,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testDecryptionError_NO_MDC() {
     val msgInfo = getMsgInfo(
       path = "messages/info/encrypted_msg_info_error_no_mdc.json",
@@ -356,6 +360,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testMissingKeyErrorChooseFromFewPubKeys() {
     val msgInfo = getMsgInfo(
       path = "messages/info/encrypted_msg_info_text_with_missing_key.json",
@@ -692,6 +697,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
 
   @Test
   @FlakyTest
+  @NotReadyForCI
   fun testSignedMsgClearSignBroken() {
     val msgInfo = getMsgInfo(
       path = "messages/info/signed_msg_clearsign_broken.json",