PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00
Code Issues Releases Wiki Activity

Fix test stability

Browse source
This commit is contained in:
Paul Schaub 2025-01-31 12:50:07 +01:00
parent f9d217c0b1
commit 4ecc590d8f
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pgpainless-core/src/test/java/org/pgpainless/key/generation/KeyGenerationSubpacketsTest.java
View file

@ -11,9 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -41,9 +38,9 @@ public class KeyGenerationSubpacketsTest {
@Test @Test
public void verifyDefaultSubpacketsForUserIdSignatures() public void verifyDefaultSubpacketsForUserIdSignatures()
throws PGPException, InvalidAlgorithmParameterException, NoSuchAlgorithmException { throws PGPException {
PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing("Alice"); PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing("Alice");
Date plus1Sec = new Date(secretKeys.getPublicKey().getCreationTime().getTime() + 1000);
KeyRingInfo info = PGPainless.inspectKeyRing(secretKeys); KeyRingInfo info = PGPainless.inspectKeyRing(secretKeys);
PGPSignature userIdSig = info.getLatestUserIdCertification("Alice"); PGPSignature userIdSig = info.getLatestUserIdCertification("Alice");
assertNotNull(userIdSig); assertNotNull(userIdSig);
@ -56,7 +53,7 @@ public class KeyGenerationSubpacketsTest {
assertEquals("Alice", info.getPrimaryUserId()); assertEquals("Alice", info.getPrimaryUserId());
secretKeys = PGPainless.modifyKeyRing(secretKeys) secretKeys = PGPainless.modifyKeyRing(secretKeys, plus1Sec)
.addUserId("Bob", .addUserId("Bob",
new SelfSignatureSubpackets.Callback() { new SelfSignatureSubpackets.Callback() {
@Override @Override
@ -68,7 +65,7 @@ public class KeyGenerationSubpacketsTest {
.addUserId("Alice", SecretKeyRingProtector.unprotectedKeys()) .addUserId("Alice", SecretKeyRingProtector.unprotectedKeys())
.done(); .done();
info = PGPainless.inspectKeyRing(secretKeys); info = PGPainless.inspectKeyRing(secretKeys, plus1Sec);
userIdSig = info.getLatestUserIdCertification("Alice"); userIdSig = info.getLatestUserIdCertification("Alice");
assertNotNull(userIdSig); assertNotNull(userIdSig);
@ -89,7 +86,7 @@ public class KeyGenerationSubpacketsTest {
assertEquals("Bob", info.getPrimaryUserId()); assertEquals("Bob", info.getPrimaryUserId());
Date now = new Date(); Date now = plus1Sec;
Date t1 = new Date(now.getTime() + 1000 * 60 * 60); Date t1 = new Date(now.getTime() + 1000 * 60 * 60);
secretKeys = PGPainless.modifyKeyRing(secretKeys, t1) secretKeys = PGPainless.modifyKeyRing(secretKeys, t1)
.addUserId("Alice", new SelfSignatureSubpackets.Callback() { .addUserId("Alice", new SelfSignatureSubpackets.Callback() {
@ -107,7 +104,7 @@ public class KeyGenerationSubpacketsTest {
@Test @Test
public void verifyDefaultSubpacketsForSubkeyBindingSignatures() public void verifyDefaultSubpacketsForSubkeyBindingSignatures()
throws PGPException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, IOException { throws PGPException {
PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing("Alice"); PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing("Alice");
KeyRingInfo info = PGPainless.inspectKeyRing(secretKeys); KeyRingInfo info = PGPainless.inspectKeyRing(secretKeys);
List<PGPPublicKey> keysBefore = info.getPublicKeys(); List<PGPPublicKey> keysBefore = info.getPublicKeys();