This commit is contained in:
Jeff Baskin 2025-08-12 09:01:25 -04:00
parent 73b4b866d4
commit 741ef41422

View File

@ -1540,10 +1540,12 @@ mod document_files {
.to_vec() .to_vec()
} }
fn create_docdef(num: usize) -> DocDef { fn create_docdef(field_types: Vec<FieldType>) -> DocDef {
let mut output = DocDef::new(); let mut output = DocDef::new();
for count in 0..num { let mut count = 0;
output.add_field(format!("field{}", count), FieldType::Uuid); for field_type in field_types.iter() {
output.add_field(format!("field{}", count), field_type.clone());
count += 1;
} }
output output
} }
@ -1749,7 +1751,11 @@ mod document_files {
fn errors_on_wrong_field_name() { fn errors_on_wrong_field_name() {
let doc_name = "mismatch"; let doc_name = "mismatch";
let field_name = Uuid::new_v4().to_string(); let field_name = Uuid::new_v4().to_string();
let (queue, rx) = test_doc(doc_name, create_docdef(1), standard_routes()); let (queue, rx) = test_doc(
doc_name,
create_docdef([FieldType::Uuid].to_vec()),
standard_routes(),
);
let mut addition = Addition::new(); let mut addition = Addition::new();
addition.add_field(field_name.clone(), Uuid::new_v4()); addition.add_field(field_name.clone(), Uuid::new_v4());
let msg = Message::new(doc_name, addition); let msg = Message::new(doc_name, addition);
@ -1767,7 +1773,11 @@ mod document_files {
#[test] #[test]
fn errors_on_wrong_field_type() { fn errors_on_wrong_field_type() {
let doc_name = "mismatch"; let doc_name = "mismatch";
let (queue, rx) = test_doc(doc_name, create_docdef(1), standard_routes()); let (queue, rx) = test_doc(
doc_name,
create_docdef([FieldType::Uuid].to_vec()),
standard_routes(),
);
let mut addition = Addition::new(); let mut addition = Addition::new();
addition.add_field("field0".to_string(), "astring"); addition.add_field("field0".to_string(), "astring");
let msg = Message::new(doc_name, addition); let msg = Message::new(doc_name, addition);
@ -1791,7 +1801,11 @@ mod document_files {
#[test] #[test]
fn errors_on_missing_fields() { fn errors_on_missing_fields() {
let doc_name = "missing"; let doc_name = "missing";
let (queue, rx) = test_doc(doc_name, create_docdef(2), standard_routes()); let (queue, rx) = test_doc(
doc_name,
create_docdef([FieldType::Uuid, FieldType::Uuid].to_vec()),
standard_routes(),
);
let mut addition = Addition::new(); let mut addition = Addition::new();
addition.add_field("field0".to_string(), Uuid::nil()); addition.add_field("field0".to_string(), Uuid::nil());
let msg = Message::new(doc_name, addition); let msg = Message::new(doc_name, addition);
@ -1809,7 +1823,11 @@ mod document_files {
#[test] #[test]
fn does_query_return_related_entries() { fn does_query_return_related_entries() {
let doc_name = "query"; let doc_name = "query";
let (queue, rx) = test_doc(doc_name, create_docdef(2), standard_routes()); let (queue, rx) = test_doc(
doc_name,
create_docdef([FieldType::Uuid, FieldType::Uuid].to_vec()),
standard_routes(),
);
let field0 = Uuid::new_v4(); let field0 = Uuid::new_v4();
let field1 = Uuid::new_v4(); let field1 = Uuid::new_v4();
for _ in 0..3 { for _ in 0..3 {