From ecc01cb09f411a21183c600131f9d2fdfeb0c3d8 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Thu, 16 May 2024 16:10:46 +0300 Subject: [PATCH] Marked some disabled flaky tests as flaky.| #2642 --- .../email/ui/AttachmentDownloadingProgressFlowTest.kt | 1 - .../ui/ComposeScreenNoKeyAvailableCreateNewKeyFlowTest.kt | 3 ++- ...ailableMultipleKeysWithPassphraseInDatabaseFlowTest.kt | 3 ++- ...yAvailableSingleKeyWithPassphraseInDatabaseFlowTest.kt | 3 ++- ...nNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest.kt | 3 ++- .../flowcrypt/email/ui/EndPassPhraseSessionFlowTest.kt | 3 ++- .../email/ui/ImportAdditionalPrivateKeysFlowTest.kt | 3 ++- .../com/flowcrypt/email/ui/MainSignInFragmentFlowTest.kt | 3 ++- .../java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt | 8 ++++---- .../com/flowcrypt/email/ui/RefreshKeysFromEkmFlowTest.kt | 3 ++- .../ui/UpdatePrivateKeyWithPassPhraseInRamFlowTest.kt | 3 ++- .../ImportAdditionalPrivateKeysFragmentInIsolationTest.kt | 3 ++- .../ParseAndSavePubKeysFragmentInIsolationTest.kt | 3 ++- .../PrivateKeysListFragmentEkmInIsolationTest.kt | 3 ++- .../email/ui/gmailapi/EncryptedComposeGmailApiFlow.kt | 3 ++- ...edMessageWithOriginalAttachmentsComposeGmailApiFlow.kt | 3 ++- ...rdMessageWithOriginalAttachmentsComposeGmailApiFlow.kt | 3 ++- .../ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt | 3 ++- .../ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt | 3 ++- ...edWithAttachmentsAndOwnPublicKeyComposeGmailApiFlow.kt | 3 ++- .../EncryptedWithAttachmentsComposeGmailApiFlow.kt | 3 ++- .../PasswordProtectedEncryptedComposeGmailApiFlow.kt | 3 ++- ...edMessageWithOriginalAttachmentsComposeGmailApiFlow.kt | 3 ++- ...rdMessageWithOriginalAttachmentsComposeGmailApiFlow.kt | 3 ++- .../ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt | 3 ++- .../email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt | 3 ++- .../StandardWithAttachmentsComposeGmailApiFlow.kt | 3 ++- 27 files changed, 54 insertions(+), 30 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingProgressFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingProgressFlowTest.kt index 2c61aa137..c1b088f4f 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingProgressFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingProgressFlowTest.kt @@ -60,7 +60,6 @@ import kotlin.random.Random @FlowCryptTestSettings(useIntents = true, useCommonIdling = false) @MediumTest @RunWith(AndroidJUnit4::class) -@Ignore("Should be fixed before the next release") class AttachmentDownloadingProgressFlowTest : BaseMessageDetailsFlowTest() { private val simpleAttInfo = TestGeneralUtil.getObjectFromJson( "messages/attachments/simple_att.json", diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableCreateNewKeyFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableCreateNewKeyFlowTest.kt index a0deeb7f7..158db4e09 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableCreateNewKeyFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableCreateNewKeyFlowTest.kt @@ -18,6 +18,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -42,7 +43,6 @@ import org.junit.runner.RunWith @MediumTest @RunWith(AndroidJUnit4::class) @FlowCryptTestSettings(useCommonIdling = false) -@Ignore("Should be fixed before the next release") class ComposeScreenNoKeyAvailableCreateNewKeyFlowTest : BaseComposeScreenNoKeyAvailableTest() { private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule( keyPath = "pgp/key_testing@flowcrypt.test_keyA_strong.asc", @@ -60,6 +60,7 @@ class ComposeScreenNoKeyAvailableCreateNewKeyFlowTest : BaseComposeScreenNoKeyAv .around(ScreenshotTestRule()) @Test + @FlakyTest fun testCreatingNewKey() { doBaseActions { onView(withText(R.string.create_a_new_key)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest.kt index 643a3e9c8..07714cf5c 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest.kt @@ -13,6 +13,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -60,7 +61,7 @@ class ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest : .around(ScreenshotTestRule()) @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testAddEmailToExistingKey() { doTestAddEmailToExistingKey { waitForObjectWithText(getResString(android.R.string.ok), 2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest.kt index e1dbaf063..f5be3ffbf 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest.kt @@ -15,6 +15,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -58,7 +59,7 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest : Bas .around(ScreenshotTestRule()) @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testImportKey() { doBaseActions { addTextToClipboard("private key", requireNotNull(pgpKeyDetails.privateKey)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest.kt index 00375c3ac..75c82e278 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest.kt @@ -12,6 +12,7 @@ import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.matcher.RootMatchers import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -36,7 +37,6 @@ import org.junit.runner.RunWith @MediumTest @RunWith(AndroidJUnit4::class) @FlowCryptTestSettings(useCommonIdling = false) -@Ignore("Should be fixed before the next release") class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest : BaseComposeScreenNoKeyAvailableTest() { private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule( keyPath = "pgp/key_testing@flowcrypt.test_keyA_strong.asc", @@ -54,6 +54,7 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest : BaseComp .around(ScreenshotTestRule()) @Test + @FlakyTest fun testAddEmailToExistingKey() { doTestAddEmailToExistingKey { onView(withId(R.id.buttonOk)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/EndPassPhraseSessionFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/EndPassPhraseSessionFlowTest.kt index b11a2ff55..c3b5bfb25 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/EndPassPhraseSessionFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/EndPassPhraseSessionFlowTest.kt @@ -17,6 +17,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.activityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By @@ -58,7 +59,6 @@ import org.junit.runner.RunWith @FlowCryptTestSettings(useIntents = true) @MediumTest @RunWith(AndroidJUnit4::class) -@Ignore("Should be fixed before the next release") class EndPassPhraseSessionFlowTest : BaseTest() { private val addAccountToDatabaseRule = AddAccountToDatabaseRule() private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule( @@ -90,6 +90,7 @@ class EndPassPhraseSessionFlowTest : BaseTest() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testEndPassPhraseSessionButton() { val timeout = 5000L val activePassPhraseSessionLabel = getResString(R.string.active_passphrase_session) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ImportAdditionalPrivateKeysFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ImportAdditionalPrivateKeysFlowTest.kt index 669ae6207..da42a3318 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ImportAdditionalPrivateKeysFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ImportAdditionalPrivateKeysFlowTest.kt @@ -12,6 +12,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.rules.activityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -72,7 +73,7 @@ class ImportAdditionalPrivateKeysFlowTest : BaseTest() { @Test @DependsOnMailServer - @Ignore("Should be fixed before the next release") + @FlakyTest fun testButtonImportBackup() { onView(withId(R.id.buttonImportBackup)) .check(matches(isDisplayed())) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MainSignInFragmentFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MainSignInFragmentFlowTest.kt index 0526463eb..780abe41a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MainSignInFragmentFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MainSignInFragmentFlowTest.kt @@ -17,6 +17,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.activityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -298,7 +299,7 @@ class MainSignInFragmentFlowTest : BaseSignTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testFailAttesterSubmit() { setupAndClickSignInButton(genMockGoogleSignInAccountJson(EMAIL_FES_ENFORCE_ATTESTER_SUBMIT)) unregisterCountingIdlingResource() diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt index 949113bda..5c3c68e61 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt @@ -216,7 +216,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testDecryptionError_KEY_MISMATCH_MissingKeyErrorImportKey() { testMissingKey( getMsgInfo( @@ -266,7 +266,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testDecryptionError_FORMAT_BadlyFormattedMsg() { val msgInfo = getMsgInfo( path = "messages/info/encrypted_msg_info_text_error_badly_formatted.json", @@ -355,7 +355,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testMissingKeyErrorChooseFromFewPubKeys() { val msgInfo = getMsgInfo( path = "messages/info/encrypted_msg_info_text_with_missing_key.json", @@ -691,7 +691,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testSignedMsgClearSignBroken() { val msgInfo = getMsgInfo( path = "messages/info/signed_msg_clearsign_broken.json", diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/RefreshKeysFromEkmFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/RefreshKeysFromEkmFlowTest.kt index be45d6a75..1d02d0d90 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/RefreshKeysFromEkmFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/RefreshKeysFromEkmFlowTest.kt @@ -13,6 +13,7 @@ import androidx.test.espresso.matcher.RootMatchers.isDialog import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -118,7 +119,7 @@ class RefreshKeysFromEkmFlowTest : BaseRefreshKeysFromEkmFlowTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testUpdatePrvKeyFromEkmShowFixMissingPassphrase() { val keysStorage = KeysStorageImpl.getInstance(getTargetContext()) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInRamFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInRamFlowTest.kt index 2d6bba492..95ed21040 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInRamFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/UpdatePrivateKeyWithPassPhraseInRamFlowTest.kt @@ -20,6 +20,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.activityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -105,7 +106,7 @@ class UpdatePrivateKeyWithPassPhraseInRamFlowTest : BaseTest() { .around(ScreenshotTestRule()) @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testUpdateSuccess() { Thread.sleep(1000) val dateFormat = DateTimeUtil.getPgpDateFormat(getTargetContext()) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ImportAdditionalPrivateKeysFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ImportAdditionalPrivateKeysFragmentInIsolationTest.kt index ca914fb59..dde0be3b9 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ImportAdditionalPrivateKeysFragmentInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ImportAdditionalPrivateKeysFragmentInIsolationTest.kt @@ -10,6 +10,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.base.BaseTest @@ -53,7 +54,7 @@ class ImportAdditionalPrivateKeysFragmentInIsolationTest : BaseTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testButtonLoadFromClipboardVisibility() { onView(withId(R.id.buttonLoadFromClipboard)) .check(matches(isDisplayed())) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ParseAndSavePubKeysFragmentInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ParseAndSavePubKeysFragmentInIsolationTest.kt index ce22ac343..274cf8d81 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ParseAndSavePubKeysFragmentInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/ParseAndSavePubKeysFragmentInIsolationTest.kt @@ -15,6 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withChild import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.base.BaseTest @@ -140,7 +141,7 @@ class ParseAndSavePubKeysFragmentInIsolationTest : BaseTest() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testIsDisplayedLabelAlreadyImported() { launchFragmentInContainer( fragmentArgs = ParseAndSavePubKeysFragmentArgs( diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeysListFragmentEkmInIsolationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeysListFragmentEkmInIsolationTest.kt index 488c28b6b..43ec12d56 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeysListFragmentEkmInIsolationTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/fragment/isolation/incontainer/PrivateKeysListFragmentEkmInIsolationTest.kt @@ -10,6 +10,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -72,7 +73,7 @@ class PrivateKeysListFragmentEkmInIsolationTest : BaseTest() { .around(ScreenshotTestRule()) @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testAddNewKeyGone() { launchFragmentInContainer() onView(withId(R.id.floatActionButtonAddKey)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedComposeGmailApiFlow.kt index d110f4e04..cb7dfa995 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedComposeGmailApiFlow.kt @@ -11,6 +11,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -50,7 +51,6 @@ import org.junit.runner.RunWith message = BaseComposeScreenTest.MESSAGE, subject = BaseComposeScreenTest.SUBJECT ) -@Ignore("Should be fixed before the next release") class EncryptedComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -73,6 +73,7 @@ class EncryptedComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //enqueue outgoing message onView(withId(R.id.menuActionSend)) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt index 0042cfee8..6fb2f955a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt @@ -14,6 +14,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -84,7 +85,7 @@ class EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFl .around(ScreenshotTestRule()) @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt index 1486de8be..e44524d79 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt @@ -16,6 +16,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -64,7 +65,6 @@ import org.junit.runner.RunWith subject = "", isNew = false ) -@Ignore("Should be fixed before the next release") class EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -87,6 +87,7 @@ class EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlo .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt index 07b5c4f72..b7916b386 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt @@ -14,6 +14,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -62,7 +63,6 @@ import org.junit.runner.RunWith subject = "", isNew = false ) -@Ignore("Should be fixed before the next release") class EncryptedReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -85,6 +85,7 @@ class EncryptedReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt index a8905fc8c..970b6ab5b 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt @@ -16,6 +16,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -63,7 +64,6 @@ import org.junit.runner.RunWith subject = "", isNew = false ) -@Ignore("Should be fixed before the next release") class EncryptedReplyComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -86,6 +86,7 @@ class EncryptedReplyComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsAndOwnPublicKeyComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsAndOwnPublicKeyComposeGmailApiFlow.kt index c26d65152..cdd63e8e8 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsAndOwnPublicKeyComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsAndOwnPublicKeyComposeGmailApiFlow.kt @@ -16,6 +16,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -45,7 +46,6 @@ import org.junit.runner.RunWith @MediumTest @RunWith(AndroidJUnit4::class) @FlowCryptTestSettings(useCommonIdling = false, useIntents = true) -@Ignore("Should be fixed before the next release") @OutgoingMessageConfiguration( to = [BaseGmailApiTest.DEFAULT_TO_RECIPIENT], cc = [BaseGmailApiTest.DEFAULT_CC_RECIPIENT], @@ -75,6 +75,7 @@ class EncryptedWithAttachmentsAndOwnPublicKeyComposeGmailApiFlow : BaseComposeGm .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //add attachments attachments.forEach { diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsComposeGmailApiFlow.kt index 53e4923a7..bbe8ba422 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedWithAttachmentsComposeGmailApiFlow.kt @@ -14,6 +14,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -50,7 +51,6 @@ import org.junit.runner.RunWith message = BaseComposeScreenTest.MESSAGE, subject = BaseComposeScreenTest.SUBJECT ) -@Ignore("Should be fixed before the next release") class EncryptedWithAttachmentsComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -73,6 +73,7 @@ class EncryptedWithAttachmentsComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //add attachments attachments.forEach { diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/PasswordProtectedEncryptedComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/PasswordProtectedEncryptedComposeGmailApiFlow.kt index 75b81b1cd..5069f4786 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/PasswordProtectedEncryptedComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/PasswordProtectedEncryptedComposeGmailApiFlow.kt @@ -15,6 +15,7 @@ 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.filters.FlakyTest import androidx.test.filters.LargeTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -160,7 +161,7 @@ class PasswordProtectedEncryptedComposeGmailApiFlow : BaseComposeGmailFlow() { } @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testSendPasswordProtectedMessageWithFewAttachments() { isRequestToMessageAPITested = false diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt index 80788c707..3d0e6abbf 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt @@ -16,6 +16,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -87,7 +88,7 @@ class StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlo .around(ScreenshotTestRule()) @Test - @Ignore("Should be fixed before the next release") + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt index 9c47128df..89cbaa6a3 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt @@ -14,6 +14,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -62,7 +63,6 @@ import org.junit.runner.RunWith subject = "", isNew = false ) -@Ignore("Should be fixed before the next release") class StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -85,6 +85,7 @@ class StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt index fd4804a56..f3d743b22 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt @@ -14,6 +14,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -61,7 +62,6 @@ import org.junit.runner.RunWith subject = "", isNew = false ) -@Ignore("Should be fixed before the next release") class StandardReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -84,6 +84,7 @@ class StandardReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //need to wait while the app loads the messages list Thread.sleep(2000) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt index 94bce55b7..66c5deca6 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt @@ -14,6 +14,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -61,7 +62,6 @@ import org.junit.runner.RunWith subject = "", isNew = false ) -@Ignore("Should be fixed before the next release") class StandardReplyComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -84,6 +84,7 @@ class StandardReplyComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //need to wait while the app loads the messages list diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardWithAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardWithAttachmentsComposeGmailApiFlow.kt index 0cfd50fde..21be87de1 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardWithAttachmentsComposeGmailApiFlow.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardWithAttachmentsComposeGmailApiFlow.kt @@ -16,6 +16,7 @@ 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.filters.FlakyTest import androidx.test.filters.MediumTest import com.flowcrypt.email.R import com.flowcrypt.email.TestConstants @@ -52,7 +53,6 @@ import org.junit.runner.RunWith message = BaseComposeScreenTest.MESSAGE, subject = BaseComposeScreenTest.SUBJECT ) -@Ignore("Should be fixed before the next release") class StandardWithAttachmentsComposeGmailApiFlow : BaseComposeGmailFlow() { override val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() { @@ -75,6 +75,7 @@ class StandardWithAttachmentsComposeGmailApiFlow : BaseComposeGmailFlow() { .around(ScreenshotTestRule()) @Test + @FlakyTest fun testSending() { //switch to standard mode openActionBarOverflowOrOptionsMenu(getTargetContext())