Merge pull request #117 from anweiss/116-validation-bug

Fix type choice in array error collection logic

src/validator/cbor.rs

@@ -3484,7 +3484,7 @@ where
               } else if !allow_empty_array {
                 self.add_error(format!("expected value {} at index {}", value, idx));
               }
-            } else {
+            } else if !self.is_multi_type_choice {
               self.add_error(format!("expected value {}, got {:?}", value, self.cbor));
             }
           }
@@ -3667,8 +3667,8 @@ mod tests {
 
     let cddl = cddl.unwrap();
 
-    let mut jv = CBORValidator::new(&cddl, cbor, Some(&["cbor"]));
-    jv.validate()?;
+    let mut cv = CBORValidator::new(&cddl, cbor, Some(&["cbor"]));
+    cv.validate()?;
 
     Ok(())
   }

src/validator/json.rs

@@ -446,7 +446,7 @@ impl<'a> JSONValidator<'a> {
             } else if !allow_empty_array {
               self.add_error(format!("expected value {} at index {}", value, idx));
             }
-          } else {
+          } else if !self.is_multi_type_choice {
             self.add_error(format!("expected value {}, got {}", value, self.json));
           }
         }
@@ -643,6 +643,7 @@ impl<'a> Visitor<'a, Error> for JSONValidator<'a> {
       // / integer ]), collect all errors and filter after the fact
       if matches!(self.json, Value::Array(_)) {
         let error_count = self.errors.len();
+
         self.visit_type_choice(type_choice)?;
 
         #[cfg(feature = "additional-controls")]