Skip to content

Commit 3a7d69d

Browse files
DenBond7DenBond7
authored
Updated SemaphoreCI to use SdkVersion to 36 (#3099)
* wip * Updated ci-setup-and-run-emulator.sh * Temporary disabled some tests * Temporary disabled some tests * Temporary disabled some tests * Temporary disabled some tests * Updated ci-install-android-sdk.sh * Updated ci-install-android-sdk.sh. Step 2. * Updated ci-install-android-sdk.sh. Step 3. * test * test * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * Fixed some tests * wip * wip * wip * Fixed some test * wip * Fixed SelectRecipientsFragmentFlowTest * Modified ComposeScreenFlowTest.kt * wip
1 parent 421187a commit 3a7d69d

23 files changed

+195
-90
lines changed

‎.idea/gradle.xml‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ package com.flowcrypt.email.ui
77

88
import android.app.Activity
99
import android.app.Instrumentation
10+
import android.content.ClipboardManager
1011
import android.content.ComponentName
12+
import android.content.Context
1113
import androidx.recyclerview.widget.RecyclerView
1214
import androidx.test.espresso.Espresso
1315
import androidx.test.espresso.Espresso.onData
@@ -72,12 +74,12 @@ import org.apache.commons.io.FileUtils
7274
import org.hamcrest.Description
7375
import org.hamcrest.Matcher
7476
import org.hamcrest.Matchers.allOf
75-
import org.hamcrest.Matchers.`is`
7677
import org.hamcrest.Matchers.not
7778
import org.junit.Assert.assertEquals
7879
import org.junit.Assert.assertTrue
7980
import org.junit.BeforeClass
8081
import org.junit.ClassRule
82+
import org.junit.Ignore
8183
import org.junit.Rule
8284
import org.junit.Test
8385
import org.junit.rules.RuleChain
@@ -95,6 +97,7 @@ import java.util.concurrent.TimeUnit
9597
*/
9698
@MediumTest
9799
@RunWith(AndroidJUnit4::class)
100+
@FlowCryptTestSettings(useCommonIdling = false, useIntents = true)
98101
class ComposeScreenFlowTest : BaseComposeScreenTest() {
99102
private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule()
100103

@@ -194,7 +197,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
194197
@Test
195198
fun testUsingStandardMsgEncryptionType() {
196199
activeActivityRule?.launch(intent)
197-
registerAllIdlingResources()
198200

199201
if (defaultMsgEncryptionType != MessageEncryptionType.STANDARD) {
200202
openActionBarOverflowOrOptionsMenu(getTargetContext())
@@ -209,7 +211,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
209211
@Test
210212
fun testUsingSecureMsgEncryptionType() {
211213
activeActivityRule?.launch(intent)
212-
registerAllIdlingResources()
213214

214215
if (defaultMsgEncryptionType != MessageEncryptionType.ENCRYPTED) {
215216
openActionBarOverflowOrOptionsMenu(getTargetContext())
@@ -250,7 +251,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
250251
@Test
251252
fun testIsScreenOfComposeNewMsg() {
252253
activeActivityRule?.launch(intent)
253-
registerAllIdlingResources()
254254

255255
Thread.sleep(1000)
256256

@@ -270,7 +270,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
270270
@Test
271271
fun testWrongFormatOfRecipientEmailAddress() {
272272
activeActivityRule?.launch(intent)
273-
registerAllIdlingResources()
274273

275274
val invalidEmailAddresses = arrayOf("test", "test@", "test@@flowcrypt.test", "@flowcrypt.test")
276275

@@ -361,9 +360,9 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
361360
}
362361

363362
@Test
363+
@Ignore("temporary disabled")
364364
fun testSelectImportPublicKeyFromPopUp() {
365365
activeActivityRule?.launch(intent)
366-
registerAllIdlingResources()
367366
intending(hasComponent(ComponentName(getTargetContext(), MainActivity::class.java)))
368367
.respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))
369368
val primaryInternetAddress = requireNotNull(pgpKeyRingDetails.getPrimaryInternetAddress())
@@ -390,8 +389,31 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
390389
onView(withText(R.string.import_their_public_key))
391390
.check(matches(isDisplayed()))
392391
.perform(click())
392+
var clipboardOk = false
393393

394-
addTextToClipboard("public key", pgpKeyRingDetails.publicKey)
394+
val clipboard =
395+
getTargetContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
396+
repeat(5) { _ ->
397+
398+
addTextToClipboard("public key", pgpKeyRingDetails.publicKey)
399+
Thread.sleep(1000)
400+
401+
val clip = clipboard.primaryClip
402+
val actualText = clip
403+
?.takeIf { it.itemCount > 0 }
404+
?.getItemAt(0)
405+
?.coerceToText(getTargetContext())
406+
?.toString()
407+
408+
if (actualText == pgpKeyRingDetails.publicKey) {
409+
clipboardOk = true
410+
return@repeat
411+
}
412+
}
413+
414+
if (!clipboardOk) {
415+
throw AssertionError("Clipboard did not contain expected public key after 5 attempts")
416+
}
395417

396418
onView(withId(R.id.buttonLoadFromClipboard))
397419
.check(matches(isDisplayed()))
@@ -414,7 +436,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
414436
@Test
415437
fun testSelectedStandardEncryptionTypeFromPopUp() {
416438
activeActivityRule?.launch(intent)
417-
registerAllIdlingResources()
418439

419440
fillInAllFields(
420441
to = setOf(
@@ -433,7 +454,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
433454
@Test
434455
fun testSelectedRemoveRecipientFromPopUp() {
435456
activeActivityRule?.launch(intent)
436-
registerAllIdlingResources()
437457

438458
onView(withId(R.id.editTextEmailAddress))
439459
.perform(
@@ -568,7 +588,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
568588
EmailUtil.genAttInfoFromPubKey(secondKeyDetails, addAccountToDatabaseRule.account.email)
569589

570590
activeActivityRule?.launch(intent)
571-
registerAllIdlingResources()
572591

573592
openActionBarOverflowOrOptionsMenu(getTargetContext())
574593
onView(withText(R.string.include_public_key))
@@ -633,7 +652,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
633652
roomDatabase.pubKeyDao().insert(keyDetails.toPublicKeyEntity(email))
634653

635654
activeActivityRule?.launch(intent)
636-
registerAllIdlingResources()
637655

638656
fillInAllFields(to = setOf(primaryInternetAddress))
639657

@@ -673,7 +691,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
673691
)
674692

675693
activeActivityRule?.launch(intent)
676-
registerAllIdlingResources()
677694

678695
fillInAllFields(to = setOf(requireNotNull(email.asInternetAddress())))
679696

@@ -713,7 +730,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
713730
assertTrue(existingKeyExpiration.isBefore(Instant.now()))
714731

715732
activeActivityRule?.launch(intent)
716-
registerAllIdlingResources()
717733

718734
fillInAllFields(to = setOf(internetAddress))
719735

@@ -764,7 +780,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
764780
assertEquals(2, keyRingInfoBeforeUpdate.userIds.size)
765781

766782
activeActivityRule?.launch(intent)
767-
registerAllIdlingResources()
768783

769784
fillInAllFields(to = setOf(internetAddress))
770785

@@ -796,7 +811,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
796811
@Test
797812
fun testKeepPublicKeysFreshFewKeysFromServer() {
798813
activeActivityRule?.launch(intent)
799-
registerAllIdlingResources()
800814

801815
fillInAllFields(to = setOf(requireNotNull(USER_WITH_FEW_KEYS_FROM_WKD.asInternetAddress())))
802816

@@ -823,7 +837,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
823837
@Test
824838
fun testWebPortalPasswordButtonIsVisibleForUserWithoutCustomerFesUrl() {
825839
activeActivityRule?.launch(intent)
826-
registerAllIdlingResources()
827840

828841
onView(withId(R.id.editTextEmailAddress))
829842
.perform(

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
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

8-
import android.view.KeyEvent
98
import androidx.test.espresso.Espresso.onView
10-
import androidx.test.espresso.action.ViewActions.clearText
119
import androidx.test.espresso.action.ViewActions.click
1210
import androidx.test.espresso.action.ViewActions.pressImeActionButton
13-
import androidx.test.espresso.action.ViewActions.pressKey
1411
import androidx.test.espresso.action.ViewActions.replaceText
1512
import androidx.test.espresso.action.ViewActions.typeText
1613
import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -31,7 +28,6 @@ import com.flowcrypt.email.rules.GrantPermissionRuleChooser
3128
import com.flowcrypt.email.rules.RetryRule
3229
import com.flowcrypt.email.rules.ScreenshotTestRule
3330
import com.flowcrypt.email.ui.base.BaseComposeScreenNoKeyAvailableTest
34-
import org.junit.Ignore
3531
import org.junit.Rule
3632
import org.junit.Test
3733
import org.junit.rules.RuleChain

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

Lines changed: 1 addition & 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
@@ -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

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

Lines changed: 1 addition & 1 deletion
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

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

Lines changed: 1 addition & 1 deletion
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

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import com.flowcrypt.email.util.exception.CommonConnectionException
3232
import com.google.gson.Gson
3333
import okhttp3.mockwebserver.MockResponse
3434
import okhttp3.mockwebserver.RecordedRequest
35+
import org.hamcrest.Matchers.anyOf
3536
import org.hamcrest.Matchers.containsString
3637
import org.hamcrest.Matchers.`is`
3738
import org.hamcrest.Matchers.not
@@ -187,7 +188,14 @@ class FesDuringSetupEnterpriseFlowTest : BaseFesDuringSetupFlowTest() {
187188
fun testFesAvailableSSLError() {
188189
setupAndClickSignInButton(genMockGoogleSignInAccountJson(EMAIL_FES_SSL_ERROR))
189190
//as our mock server support only flowcrypt.test and flowcrypt.example we will receive
190-
onView(withText(containsString("Hostname fes.wrongssl.test not verified")))
191+
onView(
192+
withText(
193+
anyOf(
194+
containsString("No address associated with hostname"),
195+
containsString("Hostname fes.wrongssl.test not verified")
196+
)
197+
)
198+
)
191199
.inRoot(withDecorView(not(`is`(decorView))))
192200
.check(matches(isDisplayed()))
193201
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import com.flowcrypt.email.base.BaseTest
2626
import com.flowcrypt.email.database.entity.PublicKeyEntity
2727
import com.flowcrypt.email.database.entity.RecipientEntity
2828
import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
29+
import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
2930
import com.flowcrypt.email.rules.AddAccountToDatabaseRule
3031
import com.flowcrypt.email.rules.AddRecipientsToDatabaseRule
3132
import com.flowcrypt.email.rules.ClearAppSettingsRule
@@ -44,12 +45,14 @@ import org.junit.rules.RuleChain
4445
import org.junit.rules.TestRule
4546
import org.junit.runner.RunWith
4647
import java.util.UUID
48+
import java.util.concurrent.TimeUnit
4749

4850

4951
/**
5052
* @author Denys Bondarenko
5153
*/
5254
@MediumTest
55+
@FlowCryptTestSettings(useCommonIdling = false, useIntents = true)
5356
@RunWith(AndroidJUnit4::class)
5457
class SelectRecipientsFragmentFlowTest : BaseTest() {
5558
override val activityScenarioRule = activityScenarioRule<CreateMessageActivity>(
@@ -118,6 +121,7 @@ class SelectRecipientsFragmentFlowTest : BaseTest() {
118121
onView(withId(getIdentifierByName("search_src_text")))
119122
.perform(clearText(), typeText("some email"))
120123
closeSoftKeyboard()
124+
waitForObjectWithText(getResString(R.string.no_results), TimeUnit.SECONDS.toMillis(10))
121125
onView(withId(R.id.tVEmpty))
122126
.check(matches(isDisplayed())).check(matches(withText(R.string.no_results)))
123127
}
@@ -126,6 +130,7 @@ class SelectRecipientsFragmentFlowTest : BaseTest() {
126130
onView(withId(getIdentifierByName("search_src_text")))
127131
.perform(clearText(), typeText(viewText))
128132
closeSoftKeyboard()
133+
waitForObjectWithText(viewText, TimeUnit.SECONDS.toMillis(10))
129134
onView(withId(viewId))
130135
.check(matches(isDisplayed())).check(matches(withText(viewText)))
131136
}

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

Lines changed: 9 additions & 5 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
@@ -62,7 +62,8 @@ class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
6262
private val userWithoutBackups = AccountDaoManager.getUserWithoutBackup()
6363
private var isSubmitPubKeyCalled = false
6464

65-
val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT,
65+
val mockWebServerRule = FlowCryptMockWebServerRule(
66+
TestConstants.MOCK_WEB_SERVER_PORT,
6667
object : okhttp3.mockwebserver.Dispatcher() {
6768
override fun dispatch(request: RecordedRequest): MockResponse {
6869
if (request.path?.startsWith("/attester/pub", ignoreCase = true) == true) {
@@ -106,7 +107,10 @@ class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
106107
.check(matches(isDisplayed()))
107108
.perform(click())
108109

109-
waitForObjectWithText(getResString(R.string.create_a_new_key).uppercase(), TimeUnit.SECONDS.toMillis(5))
110+
waitForObjectWithText(
111+
getResString(R.string.create_a_new_key).uppercase(),
112+
TimeUnit.SECONDS.toMillis(5)
113+
)
110114

111115
onView(withId(R.id.buttonCreateNewKey))
112116
.check(matches(isDisplayed()))
@@ -115,14 +119,14 @@ class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
115119
val passphrase = UUID.randomUUID().toString() + UUID.randomUUID().toString()
116120
onView(withId(R.id.editTextKeyPassword))
117121
.check(matches(isDisplayed()))
118-
.perform(replaceText(passphrase), closeSoftKeyboard())
122+
.perform(replaceText(passphrase))
119123
Thread.sleep(TimeUnit.SECONDS.toMillis(1))
120124
onView(withId(R.id.buttonSetPassPhrase))
121125
.check(matches(isDisplayed()))
122126
.perform(click())
123127
onView(withId(R.id.editTextKeyPasswordSecond))
124128
.check(matches(isDisplayed()))
125-
.perform(replaceText(passphrase), closeSoftKeyboard())
129+
.perform(replaceText(passphrase))
126130
onView(withId(R.id.buttonConfirmPassPhrases))
127131
.check(matches(isDisplayed()))
128132
.perform(click())

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.test.espresso.Espresso.onView
1010
import androidx.test.espresso.action.ViewActions.clearText
1111
import androidx.test.espresso.action.ViewActions.click
1212
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
13+
import androidx.test.espresso.action.ViewActions.replaceText
1314
import androidx.test.espresso.action.ViewActions.scrollTo
1415
import androidx.test.espresso.action.ViewActions.typeText
1516
import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -279,9 +280,9 @@ class AddOtherAccountFragmentInIsolationTest : AddOtherAccountBaseTest() {
279280

280281
private fun checkIsFieldEmptyWork(viewId: Int, stringIdForError: Int) {
281282
onView(withId(R.id.editTextEmail))
282-
.perform(scrollTo(), clearText(), typeText(authCreds.email), closeSoftKeyboard())
283+
.perform(scrollTo(), replaceText(authCreds.email), closeSoftKeyboard())
283284
onView(withId(R.id.editTextPassword))
284-
.perform(clearText(), typeText(authCreds.password), closeSoftKeyboard())
285+
.perform(replaceText(authCreds.password), closeSoftKeyboard())
285286

286287
onView(withId(viewId))
287288
.perform(scrollTo(), clearText())

0 commit comments

Comments
 (0)