tests

Signed-off-by: Pierre Fenoll <[email protected]>

Author: fenollp

.github/workflows/ci_derive.yml

@@ -27,7 +27,6 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
     - run: cargo test --features=derive,tonic
-    - run: cargo test --features=derive_all,tonic
 
   lints:
     name: Lints

prost-validate-tests/Cargo.toml

@@ -14,9 +14,8 @@ name = "harness"
 harness = false
 
 [features]
-default = ["derive", "derive_all", "reflect"]
+default = ["derive", "reflect"]
 derive = []
-derive_all = []
 reflect = []
 
 [dependencies]

prost-validate-tests/benches/harness.rs

@@ -16,27 +16,27 @@ fn reflect_validate() {
 fn derive_validate() {
     for (name, f) in CASES.iter() {
         let (message, failures) = f();
-        match ::prost_validate::Validator::validate(message.as_ref()) {
+        match prost_validate::Validator::validate(message.as_ref()) {
             Ok(_) => assert_eq!(failures, 0, "{name}: unexpected validation success"),
             Err(err) => assert!(failures > 0, "{name}: unexpected validation failure: {err}"),
         }
     }
 }
 
-#[cfg(feature = "derive_all")]
+#[cfg(feature = "derive")]
 fn derive_validate_all() {
     for (name, f) in CASES.iter() {
         let (message, failures) = f();
-        let errors = ::prost_validate::Validator::validate_all(message.as_ref());
+        let errors = prost_validate::Validator::validate_all(message.as_ref());
+        let res = if errors.is_empty() {
+            "success"
+        } else {
+            "failure"
+        };
         assert_eq!(
             failures as usize,
             errors.len(),
-            "{name}: unexpected validation {}: {errors:?}",
-            if errors.is_empty() {
-                "success"
-            } else {
-                "failure"
-            }
+            "{name}: unexpected validation {res}: {errors:?}"
         );
     }
 }
@@ -46,7 +46,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("harness reflect", |b| b.iter(reflect_validate));
     #[cfg(feature = "derive")]
     c.bench_function("harness derive", |b| b.iter(derive_validate));
-    #[cfg(feature = "derive_all")]
+    #[cfg(feature = "derive")]
     c.bench_function("harness derive_all", |b| b.iter(derive_validate_all));
 }
 

prost-validate-tests/src/test_pbjson_cases.rs

@@ -34,6 +34,20 @@ macro_rules! test_cases {
                         Ok(_) => assert_eq!(failures, 0, "unexpected validation success"),
                     }
                 }
+
+                #[cfg(feature = "derive")]
+                #[test]
+                fn derive_all() {
+                    let (message, failures) = crate::cases_pbjson::CASES.get(stringify!($name)).unwrap()();
+                    let errs = ValidatorDerive::validate_all(message.as_ref());
+                    let res = errs.is_empty().then(|| "success").unwrap_or("failure");
+                    assert_eq!(
+                        failures as usize,
+                        errs.len(),
+                        "{}: unexpected validation {res}: {errs:?}",
+                        stringify!($name),
+                    );
+                }
             }
         )*
     }