openpgp, autocrypt, guide: Make tests more robust.

  - Use a more stable formatting when comparing fingerprints.

5 files changed, 22 insertions, 28 deletions

diff --git a/autocrypt/src/lib.rs b/autocrypt/src/lib.rs
index 36af44c3..e460d41e 100644
--- a/autocrypt/src/lib.rs
+++ b/autocrypt/src/lib.rs
@@ -1067,8 +1067,8 @@ mod test {
 
         let cert = ac.headers[0].key.as_ref()
             .expect("Failed to parse key material.");
-        assert_eq!(&cert.fingerprint().to_string(),
-                   "3E88 77C8 7727 4692 9751  89F5 D03F 6F86 5226 FE8B");
+        assert_eq!(&cert.fingerprint().to_hex(),
+                   "3E8877C877274692975189F5D03F6F865226FE8B");
         assert_eq!(cert.userids().len(), 1);
         assert_eq!(cert.keys().subkeys().count(), 1);
         assert_eq!(cert.userids().next().unwrap().userid().value(),
@@ -1101,8 +1101,8 @@ mod test {
 
         let cert = ac.headers[0].key.as_ref()
             .expect("Failed to parse key material.");
-        assert_eq!(&cert.fingerprint().to_string(),
-                   "3E88 77C8 7727 4692 9751  89F5 D03F 6F86 5226 FE8B");
+        assert_eq!(&cert.fingerprint().to_hex(),
+                   "3E8877C877274692975189F5D03F6F865226FE8B");
         assert_eq!(cert.userids().len(), 1);
         assert_eq!(cert.keys().subkeys().count(), 1);
         assert_eq!(cert.userids().next().unwrap().userid().value(),
diff --git a/guide/src/chapter_03.md b/guide/src/chapter_03.md
index fac026b8..e73e90fd 100644
--- a/guide/src/chapter_03.md
+++ b/guide/src/chapter_03.md
@@ -43,8 +43,8 @@ const KEY: &str =
 fn main() -> openpgp::Result<()> {
     let cert = openpgp::Cert::from_bytes(KEY.as_bytes())?;
 
-    assert_eq!(cert.fingerprint().to_string(),
-               "C087 4478 A65C 540A 1F73  72B4 A22E AD61 4D11 744A");
+    assert_eq!(cert.fingerprint().to_hex(),
+               "C0874478A65C540A1F7372B4A22EAD614D11744A");
 
     // Iterate over UserIDs.
     assert_eq!(cert.userids().count(), 1);
@@ -52,10 +52,10 @@ fn main() -> openpgp::Result<()> {
 
     // Iterate over subkeys.
     assert_eq!(cert.keys().subkeys().count(), 2);
-    assert_eq!(cert.keys().subkeys().nth(0).unwrap().key().fingerprint().to_string(),
-               "67A4 8753 A380 A6B3 B7DF  7DC5 E6C6 897A 4CEF 8924");
-    assert_eq!(cert.keys().subkeys().nth(1).unwrap().key().fingerprint().to_string(),
-               "185C DAA1 2723 0423 19E4  7F67 108F 2CAF 9034 356D");
+    assert_eq!(cert.keys().subkeys().nth(0).unwrap().key().fingerprint().to_hex(),
+               "67A48753A380A6B3B7DF7DC5E6C6897A4CEF8924");
+    assert_eq!(cert.keys().subkeys().nth(1).unwrap().key().fingerprint().to_hex(),
+               "185CDAA12723042319E47F67108F2CAF9034356D");
 
     Ok(())
 }
@@ -132,7 +132,7 @@ fn main() -> openpgp::Result<()> {
 
     // First, we expect an one pass signature packet.
     if let openpgp::Packet::OnePassSig(ref ops) = packets[0] {
-        assert_eq!(ops.issuer().to_string(), "E6C6 897A 4CEF 8924");
+        assert_eq!(ops.issuer().to_hex(), "E6C6897A4CEF8924");
     } else {
         panic!("expected one pass signature packet");
     }
@@ -146,8 +146,8 @@ fn main() -> openpgp::Result<()> {
 
     // Finally, we expect the signature itself.
     if let openpgp::Packet::Signature(ref signature) = packets[2] {
-        assert_eq!(signature.issuer_fingerprints().nth(0).unwrap().to_string(),
-                   "67A4 8753 A380 A6B3 B7DF  7DC5 E6C6 897A 4CEF 8924");
+        assert_eq!(signature.issuer_fingerprints().nth(0).unwrap().to_hex(),
+                   "67A48753A380A6B3B7DF7DC5E6C6897A4CEF8924");
     } else {
         panic!("expected signature packet");
     }
diff --git a/openpgp/src/packet/key.rs b/openpgp/src/packet/key.rs
index 348a9396..7f7217bc 100644
--- a/openpgp/src/packet/key.rs
+++ b/openpgp/src/packet/key.rs
@@ -2035,14 +2035,14 @@ mod tests {
         let mut pki = 0;
         let mut ski = 0;
 
-        let pks = [ "8F17 7771 18A3 3DDA 9BA4  8E62 AACB 3243 6300 52D9" ];
-        let sks = [ "C03F A641 1B03 AE12 5764  6118 7223 B566 78E0 2528",
-                    "50E6 D924 308D BF22 3CFB  510A C2B8 1905 6C65 2598",
-                    "2DC5 0AB5 5BE2 F3B0 4C2D  2CF8 A350 6AFB 820A BD08"];
+        let pks = [ "8F17777118A33DDA9BA48E62AACB3243630052D9" ];
+        let sks = [ "C03FA6411B03AE12576461187223B56678E02528",
+                    "50E6D924308DBF223CFB510AC2B819056C652598",
+                    "2DC50AB55BE2F3B04C2D2CF8A3506AFB820ABD08"];
 
         for p in pile.descendants() {
             if let &Packet::PublicKey(ref p) = p {
-                let fp = p.fingerprint().to_string();
+                let fp = p.fingerprint().to_hex();
                 // eprintln!("PK: {:?}", fp);
 
                 assert!(pki < pks.len());
@@ -2051,7 +2051,7 @@ mod tests {
             }
 
             if let &Packet::PublicSubkey(ref p) = p {
-                let fp = p.fingerprint().to_string();
+                let fp = p.fingerprint().to_hex();
                 // eprintln!("SK: {:?}", fp);
 
                 assert!(ski < sks.len());
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index 399c557b..10ad1277 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -7133,12 +7133,6 @@ fn subpacket_test_1 () {
 
             assert!(got2 && got16 && got33);
 
-            let fp = sig.issuer_fingerprints().nth(0).unwrap().to_string();
-            // eprintln!("Issuer: {}", fp);
-            assert!(
-                fp == "7FAF 6ED7 2381 4355 7BDF  7ED2 6863 C9AD 5B4D 22D3"
-                || fp == "C03F A641 1B03 AE12 5764  6118 7223 B566 78E0 2528");
-
             let hex = format!("{:X}", sig.issuer_fingerprints().nth(0).unwrap());
             assert!(
                 hex == "7FAF6ED7238143557BDF7ED26863C9AD5B4D22D3"
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 4aeb5ca9..4fc0339a 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -3171,10 +3171,10 @@ mod test {
                             }) = &results[0] {
                                 assert_eq!(
                                     &sig.issuer_fingerprints().nth(0).unwrap()
-                                        .to_string(),
+                                        .to_hex(),
                                     match i {
-                                        0 => "8E8C 33FA 4626 3379 76D9  7978 069C 0C34 8DD8 2C19",
-                                        1 => "C03F A641 1B03 AE12 5764  6118 7223 B566 78E0 2528",
+                                        0 => "8E8C33FA4626337976D97978069C0C348DD82C19",
+                                        1 => "C03FA6411B03AE12576461187223B56678E02528",
                                         _ => unreachable!(),
                                     }
                                 );