Skip to content

Commit 049df6a

Browse files
DenBond7DenBond7
committed
Fixed some tests
1 parent 9b0e605 commit 049df6a

12 files changed

Lines changed: 0 additions & 43 deletions

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,11 @@ import org.apache.commons.io.FileUtils
7272
import org.hamcrest.Description
7373
import org.hamcrest.Matcher
7474
import org.hamcrest.Matchers.allOf
75-
import org.hamcrest.Matchers.`is`
7675
import org.hamcrest.Matchers.not
7776
import org.junit.Assert.assertEquals
7877
import org.junit.Assert.assertTrue
7978
import org.junit.BeforeClass
8079
import org.junit.ClassRule
81-
import org.junit.Ignore
8280
import org.junit.Rule
8381
import org.junit.Test
8482
import org.junit.rules.RuleChain
@@ -116,7 +114,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
116114
)
117115

118116
@Test
119-
@Ignore("need to fix")
120117
fun testEmptyRecipient() {
121118
activeActivityRule?.launch(intent)
122119

@@ -139,7 +136,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
139136
}
140137

141138
@Test
142-
@Ignore("need to fix")
143139
fun testEmptyEmailSubject() {
144140
activeActivityRule?.launch(intent)
145141
waitForObjectWithText(
@@ -166,7 +162,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
166162
@Test
167163
//@Ignore("flaky 5")
168164
//RepeatableAndroidJUnit4ClassRunner 50 attempts passed
169-
@Ignore("need to fix")
170165
fun testEmptyEmailMsg() {
171166
activeActivityRule?.launch(intent)
172167

@@ -196,7 +191,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
196191
}
197192

198193
@Test
199-
@Ignore("need to fix")
200194
fun testUsingStandardMsgEncryptionType() {
201195
activeActivityRule?.launch(intent)
202196
registerAllIdlingResources()
@@ -226,7 +220,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
226220
}
227221

228222
@Test
229-
@Ignore("need to fix")
230223
fun testSwitchBetweenEncryptionTypes() {
231224
activeActivityRule?.launch(intent)
232225
waitForObjectWithText(
@@ -296,7 +289,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
296289
}
297290

298291
@Test
299-
@Ignore("need to fix")
300292
fun testAddingAtts() {
301293
activeActivityRule?.launch(intent)
302294
waitForObjectWithText(
@@ -316,7 +308,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
316308
}
317309

318310
@Test
319-
@Ignore("need to fix")
320311
fun testMaxTotalAttachmentSize() {
321312
activeActivityRule?.launch(intent)
322313
Espresso.closeSoftKeyboard()
@@ -343,7 +334,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
343334
@Test
344335
//@Ignore("flaky 4")
345336
//RepeatableAndroidJUnit4ClassRunner 50 attempts passed
346-
@Ignore("need to fix")
347337
fun testDeletingAtts() {
348338
activeActivityRule?.launch(intent)
349339
waitForObjectWithText(
@@ -370,7 +360,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
370360
}
371361

372362
@Test
373-
@Ignore("need to fix")
374363
fun testSelectImportPublicKeyFromPopUp() {
375364
activeActivityRule?.launch(intent)
376365
registerAllIdlingResources()
@@ -422,7 +411,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
422411
}
423412

424413
@Test
425-
@Ignore("need to fix")
426414
fun testSelectedStandardEncryptionTypeFromPopUp() {
427415
activeActivityRule?.launch(intent)
428416
registerAllIdlingResources()
@@ -442,7 +430,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
442430
}
443431

444432
@Test
445-
@Ignore("need to fix")
446433
fun testSelectedRemoveRecipientFromPopUp() {
447434
activeActivityRule?.launch(intent)
448435
registerAllIdlingResources()
@@ -481,7 +468,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
481468
}
482469

483470
@Test
484-
@Ignore("need to fix")
485471
@FlowCryptTestSettings(useCommonIdling = false)
486472
fun testSelectedCopyFromOtherContactFromPopUp() {
487473
activeActivityRule?.launch(intent)
@@ -543,7 +529,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
543529
}
544530

545531
@Test
546-
@Ignore("need to fix")
547532
fun testSharePubKeySingle() {
548533
activeActivityRule?.launch(intent)
549534
waitForObjectWithText(
@@ -571,7 +556,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
571556
}
572557

573558
@Test
574-
@Ignore("need to fix")
575559
fun testSharePubKeyMultiply() {
576560
val secondKeyDetails =
577561
PrivateKeysManager.getPgpKeyDetailsFromAssets(TestConstants.DEFAULT_SECOND_KEY_PRV_STRONG)
@@ -603,7 +587,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
603587
}
604588

605589
@Test
606-
@Ignore("need to fix")
607590
fun testSharePubKeyNoOwnKeys() {
608591
PrivateKeysManager.deleteKey(
609592
addAccountToDatabaseRule.account,
@@ -639,7 +622,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
639622
}
640623

641624
@Test
642-
@Ignore("need to fix")
643625
fun testShowWarningIfFoundExpiredKey() {
644626
val keyDetails =
645627
PrivateKeysManager.getPgpKeyDetailsFromAssets("pgp/expired@flowcrypt.test_pub.asc")

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import com.flowcrypt.email.ui.adapter.RecipientChipRecyclerViewAdapter
3232
import com.flowcrypt.email.ui.base.BaseComposeScreenTest
3333
import com.flowcrypt.email.util.TestGeneralUtil
3434
import org.hamcrest.Matchers.allOf
35-
import org.junit.Ignore
3635
import org.junit.Rule
3736
import org.junit.Test
3837
import org.junit.rules.RuleChain
@@ -70,7 +69,6 @@ class ComposeScreenImportRecipientPubKeyFlowTest : BaseComposeScreenTest() {
7069
.around(ScreenshotTestRule())
7170

7271
@Test
73-
@Ignore("need to fix")
7472
fun testImportRecipientPubKeyFromFile() {
7573
fillDataAndMoveToImportPublicKeyScreen()
7674

@@ -94,7 +92,6 @@ class ComposeScreenImportRecipientPubKeyFlowTest : BaseComposeScreenTest() {
9492
@Test
9593
//@Ignore("flaky 7")
9694
//RepeatableAndroidJUnit4ClassRunner 50 attempts passed
97-
@Ignore("need to fix")
9895
fun testImportRecipientPubKeyFromClipboard() {
9996
fillDataAndMoveToImportPublicKeyScreen()
10097
addTextToClipboard("public key", publicKey)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import com.flowcrypt.email.rules.GrantPermissionRuleChooser
2828
import com.flowcrypt.email.rules.RetryRule
2929
import com.flowcrypt.email.rules.ScreenshotTestRule
3030
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
31-
import org.junit.Ignore
3231
import org.junit.Rule
3332
import org.junit.Test
3433
import org.junit.rules.RuleChain
@@ -60,7 +59,6 @@ class ComposeScreenNoKeyAvailableCreateNewKeyFlowTest : BaseComposeScreenNoKeyAv
6059
@Test
6160
@FlakyTest
6261
@NotReadyForCI
63-
@Ignore("need to fix")
6462
fun testCreatingNewKey() {
6563
doBaseActions {
6664
onView(withText(R.string.create_a_new_key))

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.flowcrypt.email.rules.GrantPermissionRuleChooser
2222
import com.flowcrypt.email.rules.RetryRule
2323
import com.flowcrypt.email.rules.ScreenshotTestRule
2424
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
25-
import org.junit.Ignore
2625
import org.junit.Rule
2726
import org.junit.Test
2827
import org.junit.rules.RuleChain
@@ -59,7 +58,6 @@ class ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInDatabaseFlowTest :
5958
@Test
6059
@FlakyTest
6160
@NotReadyForCI
62-
@Ignore("need to fix")
6361
fun testAddEmailToExistingKey() {
6462
doTestAddEmailToExistingKey {
6563
waitForObjectWithText(getResString(android.R.string.ok), 2000)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.flowcrypt.email.rules.GrantPermissionRuleChooser
2626
import com.flowcrypt.email.rules.RetryRule
2727
import com.flowcrypt.email.rules.ScreenshotTestRule
2828
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
29-
import org.junit.Ignore
3029
import org.junit.Rule
3130
import org.junit.Test
3231
import org.junit.rules.RuleChain
@@ -66,7 +65,6 @@ class ComposeScreenNoKeyAvailableMultipleKeysWithPassphraseInRamFlowTest :
6665
@Test
6766
//@Ignore("flaky")
6867
//RepeatableAndroidJUnit4ClassRunner 50 attempts passed
69-
@Ignore("need to fix")
7068
fun testAddEmailToExistingKey() {
7169
doTestAddEmailToExistingKey {
7270
waitForObjectWithText(getResString(android.R.string.ok), TimeUnit.SECONDS.toMillis(2))

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import com.flowcrypt.email.rules.RetryRule
2828
import com.flowcrypt.email.rules.ScreenshotTestRule
2929
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
3030
import com.flowcrypt.email.util.PrivateKeysManager
31-
import org.junit.Ignore
3231
import org.junit.Rule
3332
import org.junit.Test
3433
import org.junit.rules.RuleChain
@@ -62,7 +61,6 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest : Bas
6261
@Test
6362
@FlakyTest
6463
@NotReadyForCI
65-
@Ignore("need to fix")
6664
fun testImportKey() {
6765
doBaseActions {
6866
addTextToClipboard("private key", requireNotNull(pgpKeyDetails.privateKey))
@@ -89,7 +87,6 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInDatabaseFlowTest : Bas
8987
@Test
9088
//@Ignore("flaky")
9189
//RepeatableAndroidJUnit4ClassRunner 50 attempts passed
92-
@Ignore("need to fix")
9390
fun testAddEmailToExistingSingleKeyPassphraseInDatabase() {
9491
doTestAddEmailToExistingKey {
9592
//no more additional actions

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import com.flowcrypt.email.rules.GrantPermissionRuleChooser
2525
import com.flowcrypt.email.rules.RetryRule
2626
import com.flowcrypt.email.rules.ScreenshotTestRule
2727
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
28-
import org.junit.Ignore
2928
import org.junit.Rule
3029
import org.junit.Test
3130
import org.junit.rules.RuleChain
@@ -57,7 +56,6 @@ class ComposeScreenNoKeyAvailableSingleKeyWithPassphraseInRamFlowTest : BaseComp
5756
@Test
5857
@FlakyTest
5958
@NotReadyForCI
60-
@Ignore("need to fix")
6159
fun testAddEmailToExistingKey() {
6260
doTestAddEmailToExistingKey {
6361
onView(withId(R.id.buttonOk))

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import org.junit.Assert
3838
import org.junit.Assert.assertEquals
3939
import org.junit.Assert.assertNotNull
4040
import org.junit.ClassRule
41-
import org.junit.Ignore
4241
import org.junit.Rule
4342
import org.junit.Test
4443
import org.junit.rules.RuleChain
@@ -67,7 +66,6 @@ class ComposeScreenNoSuitablePrivateKeysFlowTest : BaseComposeScreenTest() {
6766
.around(ScreenshotTestRule())
6867

6968
@Test
70-
@Ignore("need to fix")
7169
fun testShowNoPrivateKeysSuitableForEncryptionWarning() {
7270
activeActivityRule?.launch(intent)
7371
registerAllIdlingResources()
@@ -105,7 +103,6 @@ class ComposeScreenNoSuitablePrivateKeysFlowTest : BaseComposeScreenTest() {
105103
}
106104

107105
@Test
108-
@Ignore("need to fix")
109106
fun testDoNotShowNoPrivateKeysSuitableForEncryptionWarningIfAtLeastOneKeyAvailable() {
110107
val details = PrivateKeysManager.getPgpKeyDetailsFromAssets(
111108
"pgp/default@flowcrypt.test_fisrtKey_prv_strong.asc"

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import com.flowcrypt.email.ui.base.BaseComposeScreenTest
3434
import com.flowcrypt.email.util.AccountDaoManager
3535
import com.flowcrypt.email.viewaction.CustomViewActions.clickOnChipCloseIcon
3636
import org.hamcrest.Matchers.not
37-
import org.junit.Ignore
3837
import org.junit.Rule
3938
import org.junit.Test
4039
import org.junit.rules.RuleChain
@@ -125,7 +124,6 @@ class ComposeScreenPasswordProtectedFlowTest : BaseComposeScreenTest() {
125124
}
126125

127126
@Test
128-
@Ignore("need to fix")
129127
fun testHideWebPortalPasswordButtonWhenUseStandardMsgType() {
130128
testShowWebPortalPasswordButton()
131129

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import okhttp3.mockwebserver.MockResponse
4040
import okhttp3.mockwebserver.RecordedRequest
4141
import org.hamcrest.Matchers.allOf
4242
import org.junit.ClassRule
43-
import org.junit.Ignore
4443
import org.junit.Rule
4544
import org.junit.Test
4645
import org.junit.rules.RuleChain
@@ -84,7 +83,6 @@ class ComposeScreenReloadPublicKeyFlowTest : BaseComposeScreenTest() {
8483
.around(ScreenshotTestRule())
8584

8685
@Test
87-
@Ignore("need to fix")
8886
fun testDisallowUpdateRevokedKeyFromLookup() {
8987
val primaryInternetAddress = requireNotNull(pgpKeyRingDetails.getPrimaryInternetAddress())
9088
val userWithMissingPublicKey = primaryInternetAddress.address

0 commit comments

Comments
 (0)