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

Clean up UserId.toString() behavior

Browse source
This commit is contained in:
Paul Schaub 2022-11-30 15:34:04 +01:00
parent 6913aa3d6d
commit b0c283e143
3 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pgpainless-core/src/test/java/org/pgpainless/key/UserIdTest.java
View file

@ -151,15 +151,13 @@ public class UserIdTest {
@Test
void testEmailOnlyFormatting() {
final UserId userId = UserId.onlyEmail("john.smith@example.com");
assertEquals("john.smith@example.com", userId.toString());
assertEquals("<john.smith@example.com>", userId.toString());
}
@Test
void testEmptyNameAndValidEmailFormatting() {
final UserId userId = UserId.nameAndEmail("", "john.smith@example.com");
assertEquals("john.smith@example.com", userId.toString());
assertEquals("john.smith@example.com", userId.asString(false));
assertEquals("john.smith@example.com", userId.asString(true));
assertEquals("<john.smith@example.com>", userId.toString());
}
@Test
@ -169,9 +167,7 @@ public class UserIdTest {
.withName("")
.withEmail("john.smith@example.com")
.build();
assertEquals(" () <john.smith@example.com>", userId.toString());
assertEquals(" () <john.smith@example.com>", userId.asString(false));
assertEquals("john.smith@example.com", userId.asString(true));
assertEquals("<john.smith@example.com>", userId.toString());
}
@Test

6
pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithAdditionalUserIdTest.java
View file

@ -51,9 +51,9 @@ public class GenerateKeyWithAdditionalUserIdTest {
JUtils.assertDateEquals(expiration, PGPainless.inspectKeyRing(publicKeys).getPrimaryKeyExpirationDate());
Iterator<String> userIds = publicKeys.getPublicKey().getUserIDs();
assertEquals("primary@user.id", userIds.next());
assertEquals("additional@user.id", userIds.next());
assertEquals("additional2@user.id", userIds.next());
assertEquals("<primary@user.id>", userIds.next());
assertEquals("<additional@user.id>", userIds.next());
assertEquals("<additional2@user.id>", userIds.next());
assertEquals("trimThis@user.id", userIds.next());
assertFalse(userIds.hasNext());
}