kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Expand tests for multiple identity keys (#1743)

Browse source
This commit is contained in:
Harsh Shandilya 2022-02-22 14:33:03 +05:30 committed by GitHub
parent 82e3ba6ce5
commit f08ad35d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/pull_request.yml vendored
View file

@ -6,6 +6,9 @@ concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true
env:
SENTRY_DSN: 'https://public_key@example.com/project_id'
jobs:
check-codestyle:
runs-on: ubuntu-latest

6
build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.sentry.gradle.kts
View file

@ -11,11 +11,7 @@ val INVOKED_FROM_IDE_PROPERTY = "android.injected.invoked.from.ide"
android {
androidComponents {
onVariants(selector().withFlavor(FlavorDimensions.FREE to ProductFlavors.NON_FREE)) { variant ->
val sentryDsn =
project
.providers
.environmentVariable(SENTRY_DSN_PROPERTY)
.orElse("https://public_key@example.com/project_id")
val sentryDsn = project.providers.environmentVariable(SENTRY_DSN_PROPERTY)
if (sentryDsn.isPresent) {
variant.manifestPlaceholders.put("sentryDsn", sentryDsn.get())
} else if (project.providers.gradleProperty(INVOKED_FROM_IDE_PROPERTY).orNull != "true") {

2
crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/KeyUtilsTest.kt
View file

@ -4,6 +4,7 @@ import dev.msfjarvis.aps.crypto.KeyUtils.tryGetId
import dev.msfjarvis.aps.crypto.KeyUtils.tryParseKeyring
import dev.msfjarvis.aps.crypto.TestUtils.getArmoredPrivateKeyWithMultipleIdentities
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertIs
import kotlin.test.assertNotNull
import org.bouncycastle.openpgp.PGPSecretKeyRing
@ -18,5 +19,6 @@ class KeyUtilsTest {
val keyId = tryGetId(key)
assertNotNull(keyId)
assertIs<GpgIdentifier.KeyId>(keyId)
assertEquals("b950ae2813841585", keyId.toString())
}
}

15
crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt
View file

@ -4,10 +4,12 @@ import com.github.michaelbull.result.unwrap
import com.github.michaelbull.result.unwrapError
import dev.msfjarvis.aps.crypto.GpgIdentifier.KeyId
import dev.msfjarvis.aps.crypto.GpgIdentifier.UserId
import dev.msfjarvis.aps.crypto.TestUtils.getArmoredPrivateKeyWithMultipleIdentities
import java.io.File
import kotlin.test.AfterTest
import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertContentEquals
import kotlin.test.assertEquals
import kotlin.test.assertIs
import kotlin.test.assertNotNull
@ -168,4 +170,17 @@ class PGPKeyManagerTest {
val singleKeyList = keyManager.getAllKeys().unwrap()
assertEquals(1, singleKeyList.size)
}
@Test
fun testGettingMultipleIdentityKeyWithBothUserIDs() {
scope.runTest {
val key = PGPKey(getArmoredPrivateKeyWithMultipleIdentities())
keyManager.addKey(key).unwrap()
val johnKey = keyManager.getKeyById(UserId("john@doe.org")).unwrap()
val janeKey = keyManager.getKeyById(UserId("jane@doe.org")).unwrap()
assertContentEquals(johnKey.contents, janeKey.contents)
}
}
}