Merge pull request #438 from str4d/proptest

Migrate from `quickcheck` to `proptest`
str4d · Jan 7, 2024 · 3cd0ca2 · 3cd0ca2
2 parents dd14a4e + b568e43
commit 3cd0ca2
Show file tree

Hide file tree

Showing 5 changed files with 168 additions and 78 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/age/Cargo.toml b/age/Cargo.toml
@@ -86,8 +86,7 @@ criterion = "0.5"
 futures-test = "0.3"
 hex = "0.4"
 i18n-embed = { workspace = true, features = ["desktop-requester"] }
-quickcheck = "1"
-quickcheck_macros = "1"
+proptest = "1"
 test-case = "3"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 

diff --git a/age/src/x25519.rs b/age/src/x25519.rs
@@ -231,8 +231,7 @@ impl crate::Recipient for Recipient {
 #[cfg(test)]
 pub(crate) mod tests {
     use age_core::secrecy::ExposeSecret;
-    use quickcheck::TestResult;
-    use quickcheck_macros::quickcheck;
+    use proptest::prelude::*;
     use x25519_dalek::{PublicKey, StaticSecret};
 
     use super::{Identity, Recipient};
@@ -255,27 +254,27 @@ pub(crate) mod tests {
         assert_eq!(key.to_public().to_string(), TEST_PK);
     }
 
-    #[quickcheck]
-    fn wrap_and_unwrap(sk_bytes: Vec<u8>) -> TestResult {
-        if sk_bytes.len() > 32 {
-            return TestResult::discard();
-        }
-
-        let file_key = [7; 16].into();
-        let sk = {
-            let mut tmp = [0; 32];
-            tmp[..sk_bytes.len()].copy_from_slice(&sk_bytes);
-            StaticSecret::from(tmp)
-        };
-
-        let stanzas = Recipient(PublicKey::from(&sk))
-            .wrap_file_key(&file_key)
-            .unwrap();
-        let res = Identity(sk).unwrap_stanzas(&stanzas);
-
-        match res {
-            Some(Ok(res)) => TestResult::from_bool(res.expose_secret() == file_key.expose_secret()),
-            _ => TestResult::from_bool(false),
+    proptest! {
+        #[test]
+        fn wrap_and_unwrap(sk_bytes in proptest::collection::vec(any::<u8>(), ..=32)) {
+            let file_key = [7; 16].into();
+            let sk = {
+                let mut tmp = [0; 32];
+                tmp[..sk_bytes.len()].copy_from_slice(&sk_bytes);
+                StaticSecret::from(tmp)
+            };
+
+            let stanzas = Recipient(PublicKey::from(&sk))
+                .wrap_file_key(&file_key);
+            prop_assert!(stanzas.is_ok());
+
+            let res = Identity(sk).unwrap_stanzas(&stanzas.unwrap());
+            prop_assert!(res.is_some());
+            let res = res.unwrap();
+            prop_assert!(res.is_ok());
+            let res = res.unwrap();
+
+            prop_assert_eq!(res.expose_secret(), file_key.expose_secret());
         }
     }
 }
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
@@ -541,12 +541,16 @@ criteria = "safe-to-deploy"
 version = "1.0.4"
 criteria = "safe-to-deploy"
 
-[[exemptions.quick-xml]]
-version = "0.26.0"
+[[exemptions.proptest]]
+version = "1.2.0"
 criteria = "safe-to-run"
 
-[[exemptions.quickcheck]]
-version = "1.0.3"
+[[exemptions.quick-error]]
+version = "1.2.3"
+criteria = "safe-to-run"
+
+[[exemptions.quick-xml]]
+version = "0.26.0"
 criteria = "safe-to-run"
 
 [[exemptions.rand]]
@@ -605,6 +609,10 @@ criteria = "safe-to-deploy"
 version = "0.38.28"
 criteria = "safe-to-deploy"
 
+[[exemptions.rusty-fork]]
+version = "0.3.0"
+criteria = "safe-to-run"
+
 [[exemptions.ryu]]
 version = "1.0.15"
 criteria = "safe-to-run"
@@ -761,6 +769,10 @@ criteria = "safe-to-deploy"
 version = "1.15.0"
 criteria = "safe-to-deploy"
 
+[[exemptions.unarray]]
+version = "0.1.4"
+criteria = "safe-to-run"
+
 [[exemptions.unic-langid]]
 version = "0.9.4"
 criteria = "safe-to-deploy"
@@ -773,6 +785,10 @@ criteria = "safe-to-deploy"
 version = "1.6.1"
 criteria = "safe-to-run"
 
+[[exemptions.wait-timeout]]
+version = "0.2.0"
+criteria = "safe-to-run"
+
 [[exemptions.walkdir]]
 version = "2.4.0"
 criteria = "safe-to-deploy"