Skip to content

Fixed WkdClientTest #3025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ioanmo226 merged 2 commits into from
Apr 25, 2025
Merged

Fixed WkdClientTest #3025

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828ab19
Fixed WkdClientTest.| #3024
DenBond7 Apr 24, 2025
e345a9b
Merge branch 'master' into issue_3024_fix_WkdClientTest
DenBond7 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions FlowCrypt/src/androidTest/java/com/flowcrypt/email/WkdClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.RecordedRequest
import org.apache.commons.codec.binary.ZBase32
import org.apache.commons.codec.digest.DigestUtils
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.ClassRule
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.rules.RuleChain
Expand All @@ -35,10 +35,6 @@ import java.net.HttpURLConnection

@SmallTest
@RunWith(AndroidJUnit4::class)
@Ignore(
"Need to think about this test. " +
"It uses real API calls and sometimes it fails due to a server not available issue."
)
class WkdClientTest {
private val context: Context = ApplicationProvider.getApplicationContext()

Expand All @@ -48,22 +44,21 @@ class WkdClientTest {
.around(GrantPermissionRuleChooser.grant(android.Manifest.permission.POST_NOTIFICATIONS))

@Test
fun existingEmailTest() = runBlocking {
fun existingEmailFlowCryptDomainTest() = runBlocking {
val keys = WkdClient.lookupEmail(context, EXISTING_EMAIL)
assertTrue("Key not found", keys != null)
assertTrue("There are no keys in the key collection", keys!!.keyRings.hasNext())
assertTrue("There are no keys in the key collection", requireNotNull(keys).keyRings.hasNext())
}

@Test
fun nonExistingEmailTest1() = runBlocking {
fun nonExistingEmailFlowCryptDomainTest() = runBlocking {
val keys = WkdClient.lookupEmail(context, NOT_EXISTING_EMAIL)
assertTrue("Key found for non-existing email", keys == null)
assertNull("Key found for non-existing email", keys)
}

@Test
fun nonExistingEmailTest2() = runBlocking {
val keys = WkdClient.lookupEmail(context, "doesnotexist@google.com")
assertTrue("Key found for non-existing email", keys == null)
fun nonExistingEmailForKnownDomainTest() = runBlocking {
val keys = WkdClient.lookupEmail(context, "doesnotexist@localhost")
assertNull("Key found for non-existing email", keys)
}

@Test
Expand All @@ -72,7 +67,7 @@ class WkdClientTest {
context,
"doesnotexist@thisdomaindoesnotexist.example"
)
assertTrue("Key found for non-existing email", keys == null)
assertNull("Key found for non-existing domain", keys)
}

companion object {
Expand Down