diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPKeyRingExtensionsTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPKeyRingExtensionsTest.kt index 8ff941ba..49470c75 100644 --- a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPKeyRingExtensionsTest.kt +++ b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPKeyRingExtensionsTest.kt @@ -37,36 +37,20 @@ class PGPKeyRingExtensionsTest { @Test fun `test requirePublicKey on secret key ring`() { val key = TestKeys.getJulietSecretKeyRing() - assertNotNull(assertDoesNotThrow { - key.requirePublicKey(TestKeys.JULIET_KEY_ID) - }) - assertNotNull(assertDoesNotThrow { - key.requirePublicKey(TestKeys.JULIET_FINGERPRINT) - }) + assertNotNull(assertDoesNotThrow { key.requirePublicKey(TestKeys.JULIET_KEY_ID) }) + assertNotNull(assertDoesNotThrow { key.requirePublicKey(TestKeys.JULIET_FINGERPRINT) }) - assertThrows { - key.requirePublicKey(TestKeys.ROMEO_KEY_ID) - } - assertThrows { - key.requirePublicKey(TestKeys.ROMEO_FINGERPRINT) - } + assertThrows { key.requirePublicKey(TestKeys.ROMEO_KEY_ID) } + assertThrows { key.requirePublicKey(TestKeys.ROMEO_FINGERPRINT) } } @Test fun `test requirePublicKey on public key ring`() { val key = TestKeys.getJulietPublicKeyRing() - assertNotNull(assertDoesNotThrow { - key.requirePublicKey(TestKeys.JULIET_KEY_ID) - }) - assertNotNull(assertDoesNotThrow { - key.requirePublicKey(TestKeys.JULIET_FINGERPRINT) - }) + assertNotNull(assertDoesNotThrow { key.requirePublicKey(TestKeys.JULIET_KEY_ID) }) + assertNotNull(assertDoesNotThrow { key.requirePublicKey(TestKeys.JULIET_FINGERPRINT) }) - assertThrows { - key.requirePublicKey(TestKeys.ROMEO_KEY_ID) - } - assertThrows { - key.requirePublicKey(TestKeys.ROMEO_FINGERPRINT) - } + assertThrows { key.requirePublicKey(TestKeys.ROMEO_KEY_ID) } + assertThrows { key.requirePublicKey(TestKeys.ROMEO_FINGERPRINT) } } } diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensionsTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensionsTest.kt index aab2bf91..e5e355c6 100644 --- a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensionsTest.kt +++ b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensionsTest.kt @@ -20,10 +20,11 @@ class PGPPublicKeyExtensionsTest { @Test fun `test getCurveName for all ECDSA curves`() { for (curve in EllipticCurve.values()) { - val key = PGPainless.buildKeyRing() - .setPrimaryKey(KeySpec.getBuilder(KeyType.ECDSA(curve))) - .build() - .publicKey + val key = + PGPainless.buildKeyRing() + .setPrimaryKey(KeySpec.getBuilder(KeyType.ECDSA(curve))) + .build() + .publicKey assertEquals(curve.curveName, key.getCurveName()) } @@ -32,10 +33,11 @@ class PGPPublicKeyExtensionsTest { @Test fun `test getCurveName for legacy EdDSA curves`() { for (curve in EdDSACurve.values()) { - val key = PGPainless.buildKeyRing() - .setPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(curve))) - .build() - .publicKey + val key = + PGPainless.buildKeyRing() + .setPrimaryKey(KeySpec.getBuilder(KeyType.EDDSA(curve))) + .build() + .publicKey assertEquals(curve.curveName, key.getCurveName()) } @@ -47,9 +49,7 @@ class PGPPublicKeyExtensionsTest { val key = TestKeys.getJulietPublicKeyRing() assertEquals(PublicKeyAlgorithm.RSA_GENERAL, key.publicKey.publicKeyAlgorithm) - assertThrows { - key.publicKey.getCurveName() - } + assertThrows { key.publicKey.getCurveName() } } @Test diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyExtensionsTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyExtensionsTest.kt index 6edf3fa4..6dc1e4d4 100644 --- a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyExtensionsTest.kt +++ b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyExtensionsTest.kt @@ -21,9 +21,7 @@ class PGPSecretKeyExtensionsTest { val key = TestKeys.getCryptieSecretKeyRing() val secKey = key.secretKey - val privKey = assertDoesNotThrow { - secKey.unlock(TestKeys.CRYPTIE_PASSPHRASE) - } + val privKey = assertDoesNotThrow { secKey.unlock(TestKeys.CRYPTIE_PASSPHRASE) } assertNotNull(privKey) } @@ -32,9 +30,7 @@ class PGPSecretKeyExtensionsTest { val key = TestKeys.getCryptieSecretKeyRing() val secKey = key.secretKey - assertThrows { - secKey.unlock(Passphrase.emptyPassphrase()) - } + assertThrows { secKey.unlock(Passphrase.emptyPassphrase()) } } @Test @@ -42,9 +38,7 @@ class PGPSecretKeyExtensionsTest { val key = TestKeys.getEmilSecretKeyRing() val secKey = key.secretKey - val privKey = assertDoesNotThrow { - secKey.unlock() - } + val privKey = assertDoesNotThrow { secKey.unlock() } assertNotNull(privKey) } @@ -53,9 +47,7 @@ class PGPSecretKeyExtensionsTest { val key = TestKeys.getEmilSecretKeyRing() val secKey = key.secretKey - val privKey = assertDoesNotThrow { - secKey.unlock(Passphrase.emptyPassphrase()) - } + val privKey = assertDoesNotThrow { secKey.unlock(Passphrase.emptyPassphrase()) } assertNotNull(privKey) } diff --git a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyRingExtensionsTest.kt b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyRingExtensionsTest.kt index e629a5a1..90641aff 100644 --- a/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyRingExtensionsTest.kt +++ b/pgpainless-core/src/test/kotlin/org/pgpainless/bouncycastle/extensions/PGPSecretKeyRingExtensionsTest.kt @@ -4,6 +4,7 @@ package org.pgpainless.bouncycastle.extensions +import java.io.ByteArrayOutputStream import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Assertions.assertNull @@ -15,7 +16,6 @@ import org.pgpainless.encryption_signing.ProducerOptions import org.pgpainless.encryption_signing.SigningOptions import org.pgpainless.key.TestKeys import org.pgpainless.key.protection.SecretKeyRingProtector -import java.io.ByteArrayOutputStream class PGPSecretKeyRingExtensionsTest { @@ -35,24 +35,20 @@ class PGPSecretKeyRingExtensionsTest { assertNotNull(key.requireSecretKey(TestKeys.EMIL_KEY_ID)) assertNotNull(key.requireSecretKey(TestKeys.EMIL_FINGERPRINT)) - assertThrows { - key.requireSecretKey(TestKeys.ROMEO_KEY_ID) - } - assertThrows { - key.requireSecretKey(TestKeys.ROMEO_FINGERPRINT) - } + assertThrows { key.requireSecretKey(TestKeys.ROMEO_KEY_ID) } + assertThrows { key.requireSecretKey(TestKeys.ROMEO_FINGERPRINT) } } @Test fun testGetSecretKeyForSignature() { val key = TestKeys.getEmilSecretKeyRing() - val signer = PGPainless.encryptAndOrSign() - .onOutputStream(ByteArrayOutputStream()) - .withOptions( - ProducerOptions.sign(SigningOptions.get() - .addDetachedSignature(SecretKeyRingProtector.unprotectedKeys(), key) - ) - ) + val signer = + PGPainless.encryptAndOrSign() + .onOutputStream(ByteArrayOutputStream()) + .withOptions( + ProducerOptions.sign( + SigningOptions.get() + .addDetachedSignature(SecretKeyRingProtector.unprotectedKeys(), key))) signer.write("Hello, World!\n".toByteArray()) signer.close() val sig = signer.result.detachedSignatures.first().value.first()