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

issue #91 Improve class UserId

Browse source
This commit is contained in:
Ivan Pizhenko 2021-02-21 15:11:09 +02:00
parent 3e75d325a8
commit e5aaebe174
4 changed files with 280 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2020 Paul Schaub.
* Copyright 2020 Paul Schaub. Copyright 2021 Flowcrypt a.s.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -15,37 +15,36 @@
*/
package org.pgpainless.key;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
import org.pgpainless.key.util.UserId;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class UserIdTest {
@Test
public void throwForNullName() {
assertThrows(IllegalArgumentException.class, () -> UserId.withName(null));
assertThrows(IllegalArgumentException.class, () -> UserId.newBuilder().withName(null));
}
@Test
public void throwForNullComment() {
assertThrows(IllegalArgumentException.class, () -> UserId.withName("foo")
.withComment(null));
assertThrows(IllegalArgumentException.class, () -> UserId.newBuilder().withComment(null));
}
@Test
public void throwForNullEmail() {
assertThrows(IllegalArgumentException.class, () -> UserId.withName("foo")
.withComment("bar")
.withEmail(null));
assertThrows(IllegalArgumentException.class, () -> UserId.newBuilder().withEmail(null));
}
@Test
public void testFormatOnlyName() {
assertEquals(
"Juliet Capulet",
UserId.withName("Juliet Capulet")
UserId.newBuilder().withName("Juliet Capulet")
.build().toString());
}
@ -53,26 +52,28 @@ public class UserIdTest {
public void testFormatNameAndComment() {
assertEquals(
"Juliet Capulet (from the play)",
UserId.withName("Juliet Capulet")
UserId.newBuilder().withName("Juliet Capulet")
.withComment("from the play")
.noEmail().toString());
.noEmail().build().toString());
}
@Test
public void testFormatNameCommentAndMail() {
assertEquals("Juliet Capulet (from the play) <juliet@capulet.lit>",
UserId.withName("Juliet Capulet")
UserId.newBuilder().withName("Juliet Capulet")
.withComment("from the play")
.withEmail("juliet@capulet.lit")
.build()
.toString());
}
@Test
public void testFormatNameAndEmail() {
assertEquals("Juliet Capulet <juliet@capulet.lit>",
UserId.withName("Juliet Capulet")
UserId.newBuilder().withName("Juliet Capulet")
.noComment()
.withEmail("juliet@capulet.lit")
.build()
.toString());
}
@ -86,4 +87,134 @@ public class UserIdTest {
UserId userId = UserId.nameAndEmail("Maurice Moss", "moss.m@reynholm.co.uk");
assertEquals("Maurice Moss <moss.m@reynholm.co.uk>", userId.toString());
}
@Test
void testBuilderWithName() {
final UserId userId = UserId.newBuilder().withName("John Smith").build();
assertEquals("John Smith", userId.getName());
assertNull(userId.getComment());
assertNull(userId.getEmail());
}
@Test
void testBuilderWithComment() {
final UserId userId = UserId.newBuilder().withComment("Sales Dept.").build();
assertNull(userId.getName());
assertEquals("Sales Dept.", userId.getComment());
assertNull(userId.getEmail());
}
@Test
void testBuilderWithEmail() {
final UserId userId = UserId.newBuilder().withEmail("john.smith@example.com").build();
assertNull(userId.getName());
assertNull(userId.getComment());
assertEquals("john.smith@example.com", userId.getEmail());
}
@Test
void testBuilderWithAll() {
final UserId userId = UserId.newBuilder().withEmail("john.smith@example.com")
.withName("John Smith")
.withEmail("john.smith@example.com")
.withComment("Sales Dept.").build();
assertEquals("John Smith", userId.getName());
assertEquals("Sales Dept.", userId.getComment());
assertEquals("john.smith@example.com", userId.getEmail());
}
@Test
void testBuilderNoName() {
final UserId.Builder builder = UserId.newBuilder()
.withEmail("john.smith@example.com")
.withName("John Smith")
.withComment("Sales Dept.").build().toBuilder();
final UserId userId = builder.noName().build();
assertNull(userId.getName());
assertEquals("Sales Dept.", userId.getComment());
assertEquals("john.smith@example.com", userId.getEmail());
}
@Test
void testBuilderNoComment() {
final UserId.Builder builder = UserId.newBuilder()
.withEmail("john.smith@example.com")
.withName("John Smith")
.withComment("Sales Dept.").build().toBuilder();
final UserId userId = builder.noComment().build();
assertEquals("John Smith", userId.getName());
assertNull(userId.getComment());
assertEquals("john.smith@example.com", userId.getEmail());
}
@Test
void testBuilderNoEmail() {
final UserId.Builder builder = UserId.newBuilder()
.withEmail("john.smith@example.com")
.withName("John Smith")
.withComment("Sales Dept.").build().toBuilder();
final UserId userId = builder.noEmail().build();
assertEquals("John Smith", userId.getName());
assertEquals("Sales Dept.", userId.getComment());
assertNull(userId.getEmail());
}
@Test
void testEmailOnlyFormatting() {
final UserId userId = UserId.onlyEmail("john.smith@example.com");
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));
}
@Test
void testEmptyNameAndEmptyCommentAndValidEmailFormatting() {
final UserId userId = UserId.newBuilder()
.withComment("")
.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));
}
@Test
void testEqualsWithDifferentCaseEmails() {
final String name = "John Smith";
final String comment = "Sales Dept.";
final String email = "john.smith@example.com";
final String upperEmail = email.toUpperCase();
final UserId userId1 = UserId.newBuilder().withComment(comment).withName(name).withEmail(email).build();
final UserId userId2 = UserId.newBuilder().withComment(comment).withName(name).withEmail(upperEmail).build();
assertEquals(userId1, userId2);
}
@Test
void testNotEqualWithDifferentNames() {
final String name1 = "John Smith";
final String name2 = "Don Duck";
final String comment = "Sales Dept.";
final String email = "john.smith@example.com";
final UserId userId1 = UserId.newBuilder().withComment(comment).withName(name1).withEmail(email).build();
final UserId userId2 = UserId.newBuilder().withComment(comment).withName(name2).withEmail(email).build();
assertNotEquals(userId1, userId2);
}
@Test
void testNotEqualWithDifferentComments() {
final String name = "John Smith";
final String comment1 = "Sales Dept.";
final String comment2 = "Legal Dept.";
final String email = "john.smith@example.com";
final UserId userId1 = UserId.newBuilder().withComment(comment1).withName(name).withEmail(email).build();
final UserId userId2 = UserId.newBuilder().withComment(comment2).withName(name).withEmail(email).build();
assertNotEquals(userId1, userId2);
}
}

2
pgpainless-core/src/test/java/org/pgpainless/key/modification/RevokeKeyWithGenericCertificationSignatureTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2021 Ivan Pizhenko, Paul Schaub.
* Copyright 2021 Paul Schaub. Copyright 2021 Flowcrypt a.s.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

3
pgpainless-core/src/test/java/org/pgpainless/util/selection/userid/SelectUserIdTest.java
View file

@ -39,7 +39,8 @@ public class SelectUserIdTest {
.simpleEcKeyRing("<alice@wonderland.lit>");
secretKeys = PGPainless.modifyKeyRing(secretKeys)
.addUserId(
UserId.withName("Alice Liddell").noComment().withEmail("crazy@the-rabbit.hole"),
UserId.newBuilder().withName("Alice Liddell").noComment()
.withEmail("crazy@the-rabbit.hole").build(),
SecretKeyRingProtector.unprotectedKeys())
.done();