Add test key with email uid

assets/test_vectors/keys/emil_pub.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.64
+
+mFIEXhtfCBMIKoZIzj0DAQcCAwTGSFMBUOSLusXS8hdNHbdK3gN8hS7jd4ky7Czl
+mSti+oVyRJUwQAFZJ1NMsg1H8flSJP1/9YbHd9FBU4bHKGKPtBE8ZW1pbEBlbWFp
+bC51c2VyPoh1BBMTCgAdBQJeG18IAhsjBRYCAwEABAsJCAcFFQoJCAsCHgEACgkQ
+VzbmkxrPNwz8rAD/S/VCQc5NJLArgTDkgrt3Q573HiYfrIQo1uk3dwV15WIBAMiq
+oDmRMb8jzOBv6FGW4P5WAubPdnAvDD7XmArD+TSeuFYEXhtfCBIIKoZIzj0DAQcC
+AwTgWDWmHJLQUQ35Qg/rINmUhkUhj1E4O5t6Y2PipbqlGfDufLmIKnX40BoJPS4G
+HW7U0QXfwSaTXa1BAaNsMUomAwEIB4h1BBgTCgAdBQJeG18IAhsMBRYCAwEABAsJ
+CAcFFQoJCAsCHgEACgkQVzbmkxrPNwxOcwEA19Fnhw7XwpQoT61Fqg54vroAwTZ3
+T5A+LOdevAtzNOUA/RWeKfOGk6D+vKYRNpMJyqsHi/vBeKwXoeN0n6HuExVF
+=a1W7
+-----END PGP PUBLIC KEY BLOCK-----

assets/test_vectors/keys/emil_sec.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: BCPG v1.64
+
+lHcEXhtfCBMIKoZIzj0DAQcCAwTGSFMBUOSLusXS8hdNHbdK3gN8hS7jd4ky7Czl
+mSti+oVyRJUwQAFZJ1NMsg1H8flSJP1/9YbHd9FBU4bHKGKPAAD5AdecgJ92sAXP
+l4U4oW6l4KKUb8IT3J5g68Z+Q9WIq6kS5bQRPGVtaWxAZW1haWwudXNlcj6IdQQT
+EwoAHQUCXhtfCAIbIwUWAgMBAAQLCQgHBRUKCQgLAh4BAAoJEFc25pMazzcM/KwA
+/0v1QkHOTSSwK4Ew5IK7d0Oe9x4mH6yEKNbpN3cFdeViAQDIqqA5kTG/I8zgb+hR
+luD+VgLmz3ZwLww+15gKw/k0npx7BF4bXwgSCCqGSM49AwEHAgME4Fg1phyS0FEN
++UIP6yDZlIZFIY9RODubemNj4qW6pRnw7ny5iCp1+NAaCT0uBh1u1NEF38Emk12t
+QQGjbDFKJgMBCAcAAQCMHcK/wrUR1R8HKvLUFzUB/a5zj1reOzQOsFtoLte3Mg6u
+iHUEGBMKAB0FAl4bXwgCGwwFFgIDAQAECwkIBwUVCgkICwIeAQAKCRBXNuaTGs83
+DE5zAQDX0WeHDtfClChPrUWqDni+ugDBNndPkD4s5168C3M05QD9FZ4p84aToP68
+phE2kwnKqweL+8F4rBeh43Sfoe4TFUU=
+=Pqd/
+-----END PGP PRIVATE KEY BLOCK-----

pgpainless-core/src/test/java/org/pgpainless/key/TestKeys.java

@@ -34,11 +34,15 @@ public class TestKeys {
     private static PGPPublicKeyRing julietPublicKeyRing = null;
     private static PGPSecretKeyRing romeoSecretKeyRing = null;
     private static PGPPublicKeyRing romeoPublicKeyRing = null;
+    private static PGPSecretKeyRing emilSecretKeyRing = null;
+    private static PGPPublicKeyRing emilPublicKeyRing = null;
 
     private static PGPSecretKeyRingCollection julietSecretKeyRingCollection = null;
     private static PGPPublicKeyRingCollection julietPublicKeyRingCollection = null;
     private static PGPSecretKeyRingCollection romeoSecretKeyRingCollection = null;
     private static PGPPublicKeyRingCollection romeoPublicKeyRingCollection = null;
+    private static PGPSecretKeyRingCollection emilSecretKeyRingCollection = null;
+    private static PGPPublicKeyRingCollection emilPublicKeyRingCollection = null;
 
     public static final String JULIET_UID = "xmpp:juliet@capulet.lit";
     public static final long JULIET_KEY_ID = -5425419407118114754L;
@@ -168,6 +172,51 @@ public class TestKeys {
             "=LZ1b\n" +
             "-----END PGP PRIVATE KEY BLOCK-----";
 
+    public static final String EMIL_UID = "<emil@email.user>";
+    public static final long EMIL_KEY_ID = 6284463849526474508L;
+    public static final String EMIL_FINGERPRINT_STRING = "4F665C4DC2C4660BC6425E415736E6931ACF370C";
+    public static final OpenPgpV4Fingerprint EMIL_FINGERPRINT = new OpenPgpV4Fingerprint(EMIL_FINGERPRINT_STRING);
+
+    /**
+     * Public key of <pre><emil@email.user></pre>.
+     */
+    public static final String EMIL_PUB = "" +
+            "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" +
+            "Version: BCPG v1.64\n" +
+            "\n" +
+            "mFIEXhtfCBMIKoZIzj0DAQcCAwTGSFMBUOSLusXS8hdNHbdK3gN8hS7jd4ky7Czl\n" +
+            "mSti+oVyRJUwQAFZJ1NMsg1H8flSJP1/9YbHd9FBU4bHKGKPtBE8ZW1pbEBlbWFp\n" +
+            "bC51c2VyPoh1BBMTCgAdBQJeG18IAhsjBRYCAwEABAsJCAcFFQoJCAsCHgEACgkQ\n" +
+            "VzbmkxrPNwz8rAD/S/VCQc5NJLArgTDkgrt3Q573HiYfrIQo1uk3dwV15WIBAMiq\n" +
+            "oDmRMb8jzOBv6FGW4P5WAubPdnAvDD7XmArD+TSeuFYEXhtfCBIIKoZIzj0DAQcC\n" +
+            "AwTgWDWmHJLQUQ35Qg/rINmUhkUhj1E4O5t6Y2PipbqlGfDufLmIKnX40BoJPS4G\n" +
+            "HW7U0QXfwSaTXa1BAaNsMUomAwEIB4h1BBgTCgAdBQJeG18IAhsMBRYCAwEABAsJ\n" +
+            "CAcFFQoJCAsCHgEACgkQVzbmkxrPNwxOcwEA19Fnhw7XwpQoT61Fqg54vroAwTZ3\n" +
+            "T5A+LOdevAtzNOUA/RWeKfOGk6D+vKYRNpMJyqsHi/vBeKwXoeN0n6HuExVF\n" +
+            "=a1W7\n" +
+            "-----END PGP PUBLIC KEY BLOCK-----";
+
+    /**
+     * Secret key of <pre><emil@email.user></pre>.
+     */
+    public static final String EMIL_SEC = "" +
+            "-----BEGIN PGP PRIVATE KEY BLOCK-----\n" +
+            "Version: BCPG v1.64\n" +
+            "\n" +
+            "lHcEXhtfCBMIKoZIzj0DAQcCAwTGSFMBUOSLusXS8hdNHbdK3gN8hS7jd4ky7Czl\n" +
+            "mSti+oVyRJUwQAFZJ1NMsg1H8flSJP1/9YbHd9FBU4bHKGKPAAD5AdecgJ92sAXP\n" +
+            "l4U4oW6l4KKUb8IT3J5g68Z+Q9WIq6kS5bQRPGVtaWxAZW1haWwudXNlcj6IdQQT\n" +
+            "EwoAHQUCXhtfCAIbIwUWAgMBAAQLCQgHBRUKCQgLAh4BAAoJEFc25pMazzcM/KwA\n" +
+            "/0v1QkHOTSSwK4Ew5IK7d0Oe9x4mH6yEKNbpN3cFdeViAQDIqqA5kTG/I8zgb+hR\n" +
+            "luD+VgLmz3ZwLww+15gKw/k0npx7BF4bXwgSCCqGSM49AwEHAgME4Fg1phyS0FEN\n" +
+            "+UIP6yDZlIZFIY9RODubemNj4qW6pRnw7ny5iCp1+NAaCT0uBh1u1NEF38Emk12t\n" +
+            "QQGjbDFKJgMBCAcAAQCMHcK/wrUR1R8HKvLUFzUB/a5zj1reOzQOsFtoLte3Mg6u\n" +
+            "iHUEGBMKAB0FAl4bXwgCGwwFFgIDAQAECwkIBwUVCgkICwIeAQAKCRBXNuaTGs83\n" +
+            "DE5zAQDX0WeHDtfClChPrUWqDni+ugDBNndPkD4s5168C3M05QD9FZ4p84aToP68\n" +
+            "phE2kwnKqweL+8F4rBeh43Sfoe4TFUU=\n" +
+            "=Pqd/\n" +
+            "-----END PGP PRIVATE KEY BLOCK-----";
+
     public static PGPSecretKeyRing getJulietSecretKeyRing() throws IOException, PGPException {
         if (julietSecretKeyRing == null) {
             julietSecretKeyRing = new PGPSecretKeyRing(
@@ -232,6 +281,38 @@ public class TestKeys {
         return romeoPublicKeyRingCollection;
     }
 
+    public static PGPSecretKeyRing getEmilSecretKeyRing() throws IOException, PGPException {
+        if (emilSecretKeyRing == null) {
+            emilSecretKeyRing = new PGPSecretKeyRing(
+                    PGPUtil.getDecoderStream(new ByteArrayInputStream(EMIL_SEC.getBytes())), calc);
+        }
+        return emilSecretKeyRing;
+    }
+
+    public static PGPSecretKeyRingCollection getEmilSecretKeyRingCollection() throws IOException, PGPException {
+        if (emilSecretKeyRingCollection == null) {
+            emilSecretKeyRingCollection = new PGPSecretKeyRingCollection(
+                    PGPUtil.getDecoderStream(new ByteArrayInputStream(EMIL_SEC.getBytes())), calc);
+        }
+        return emilSecretKeyRingCollection;
+    }
+
+    public static PGPPublicKeyRing getEmilPublicKeyRing() throws IOException {
+        if (emilPublicKeyRing == null) {
+            emilPublicKeyRing = new PGPPublicKeyRing(
+                    PGPUtil.getDecoderStream(new ByteArrayInputStream(EMIL_PUB.getBytes())), calc);
+        }
+        return emilPublicKeyRing;
+    }
+
+    public static PGPPublicKeyRingCollection getEmilPublicKeyRingCollection() throws IOException, PGPException {
+        if (emilPublicKeyRingCollection == null) {
+            emilPublicKeyRingCollection = new PGPPublicKeyRingCollection(
+                    PGPUtil.getDecoderStream(new ByteArrayInputStream(EMIL_PUB.getBytes())), calc);
+        }
+        return emilPublicKeyRingCollection;
+    }
+
     public static final String TEST_MESSAGE_01_PLAIN = "This message is encrypted\n";
 
     /**
@@ -257,4 +338,5 @@ public class TestKeys {
                     "GmPGRU4LsOYbpPFy\n" +
                     "=caif\n" +
                     "-----END PGP MESSAGE-----";
+
 }

pgpainless-core/src/test/java/org/pgpainless/key/TestKeysTest.java

@@ -30,14 +30,18 @@ public class TestKeysTest {
 
     private final PGPSecretKeyRing julietSecRing;
     private final PGPSecretKeyRing romeoSecRing;
+    private final PGPSecretKeyRing emilSecRing;
     private final PGPPublicKeyRing julietPubRing;
     private final PGPPublicKeyRing romeoPubRing;
+    private final PGPPublicKeyRing emilPubRing;
 
     public TestKeysTest() throws IOException, PGPException {
         this.julietSecRing = TestKeys.getJulietSecretKeyRing();
         this.romeoSecRing = TestKeys.getRomeoSecretKeyRing();
+        this.emilSecRing = TestKeys.getEmilSecretKeyRing();
         this.julietPubRing = TestKeys.getJulietPublicKeyRing();
         this.romeoPubRing = TestKeys.getRomeoPublicKeyRing();
+        this.emilPubRing = TestKeys.getEmilPublicKeyRing();
     }
 
     @Test
@@ -110,4 +114,38 @@ public class TestKeysTest {
         PGPPublicKeyRing julietsPublicKeys = TestKeys.getJulietPublicKeyRing();
         assertEquals(julietSecRing.getPublicKey().getKeyID(), julietsPublicKeys.getPublicKey().getKeyID());
     }
+
+    @Test
+    public void assertEmilsPublicKeyIsSameInPubRingAndSecRing() throws IOException {
+        assertArrayEquals(emilSecRing.getPublicKey().getEncoded(), emilPubRing.getPublicKey().getEncoded());
+    }
+
+    @Test
+    public void assertEmilsKeysIdEquals() {
+        assertEquals(TestKeys.EMIL_KEY_ID, emilSecRing.getSecretKey().getKeyID());
+        assertEquals(TestKeys.EMIL_KEY_ID, emilSecRing.getPublicKey().getKeyID());
+        assertEquals(TestKeys.EMIL_KEY_ID, emilPubRing.getPublicKey().getKeyID());
+    }
+
+    @Test
+    public void assertEmilsKeyUIDEquals() {
+        assertEquals(TestKeys.EMIL_UID, emilSecRing.getPublicKey().getUserIDs().next());
+        assertEquals(1, TestUtils.getNumberOfItemsInIterator(emilSecRing.getPublicKey().getUserIDs()));
+    }
+
+    @Test
+    public void assertEmilsKeyRingFingerprintMatches() {
+        assertEquals(TestKeys.EMIL_FINGERPRINT, new OpenPgpV4Fingerprint(emilSecRing));
+    }
+
+    @Test
+    public void assertEmilsPublicKeyFingerprintMatchesHerSecretKeyFingerprint() {
+        assertEquals(new OpenPgpV4Fingerprint(emilSecRing.getPublicKey()), new OpenPgpV4Fingerprint(emilSecRing.getSecretKey()));
+    }
+
+    @Test
+    public void assertEmilsFingerprintGetKeyIdMatches() {
+        assertEquals("calling getKeyId() on emil's fingerprint must return her key id.",
+                TestKeys.EMIL_KEY_ID, TestKeys.EMIL_FINGERPRINT.getKeyId());
+    }
 }