From 983abfa7c62a2ddb58d6316a5d928900addf0b2b Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Wed, 25 Mar 2026 10:52:11 -0400 Subject: [PATCH] Moved query tests to client. --- tests/query_test.rs | 46 ++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/tests/query_test.rs b/tests/query_test.rs index 74d4799..68cce1e 100644 --- a/tests/query_test.rs +++ b/tests/query_test.rs @@ -13,8 +13,9 @@ const COUNT: usize = 5; fn does_empty_query_get_all_documents() { let (test_env, test_doc) = setup_range(COUNT); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); let mut query = Query::new(test_doc.get_doc_name()); - let result = mtt.records(query).unwrap(); + let result = client.records(query).unwrap(); assert_eq!(result.len(), 5, "got {:?}", result); let mut holder: HashSet = HashSet::new(); for rec in result.iter() { @@ -32,6 +33,7 @@ fn does_empty_query_get_all_documents() { fn does_query_pull_specific_information() { let (test_env, test_doc) = setup_range(COUNT); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); let expected = 3; let mut calc = Calculation::new(Operand::Equal); calc.add_value(expected.clone()).unwrap(); @@ -39,7 +41,7 @@ fn does_query_pull_specific_information() { .unwrap(); let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc); - let result = mtt.records(query).unwrap(); + let result = client.records(query).unwrap(); assert_eq!(result.len(), 1); let rec = result.iter().last().unwrap(); assert_eq!( @@ -52,6 +54,7 @@ fn does_query_pull_specific_information() { fn does_query_work_with_less_than() { let (test_env, test_doc) = setup_range(COUNT); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); let expected = 2; let mut calc = Calculation::new(Operand::LessThan); calc.add_value(expected.clone()).unwrap(); @@ -59,7 +62,7 @@ fn does_query_work_with_less_than() { .unwrap(); let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc); - let result = mtt.records(query).unwrap(); + let result = client.records(query).unwrap(); assert_eq!(result.len(), 2, "got {:?}", result); let mut holder: HashSet = HashSet::new(); for rec in result.iter() { @@ -77,6 +80,7 @@ fn does_query_work_with_less_than() { fn does_query_work_with_less_than_equal() { let (test_env, test_doc) = setup_range(COUNT); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); let expected = 2; let mut calc = Calculation::new(Operand::LessThanEqual); calc.add_value(expected.clone()).unwrap(); @@ -84,7 +88,7 @@ fn does_query_work_with_less_than_equal() { .unwrap(); let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc); - let result = mtt.records(query).unwrap(); + let result = client.records(query).unwrap(); assert_eq!(result.len(), 3, "got {:?}", result); let mut holder: HashSet = HashSet::new(); for rec in result.iter() { @@ -102,6 +106,7 @@ fn does_query_work_with_less_than_equal() { fn does_query_work_with_greater_than() { let (test_env, test_doc) = setup_range(COUNT); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); let expected = 2; let mut calc = Calculation::new(Operand::GreaterThan); calc.add_value(expected.clone()).unwrap(); @@ -109,7 +114,7 @@ fn does_query_work_with_greater_than() { .unwrap(); let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc); - let result = mtt.records(query).unwrap(); + let result = client.records(query).unwrap(); assert_eq!(result.len(), 2, "got {:?}", result); let mut holder: HashSet = HashSet::new(); for rec in result.iter() { @@ -126,6 +131,7 @@ fn does_query_work_with_greater_than() { fn does_query_work_with_greater_than_equal() { let (test_env, test_doc) = setup_range(COUNT); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); let expected = 2; let mut calc = Calculation::new(Operand::GreaterThanEqual); calc.add_value(expected.clone()).unwrap(); @@ -133,7 +139,7 @@ fn does_query_work_with_greater_than_equal() { .unwrap(); let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc); - let result = mtt.records(query).unwrap(); + let result = client.records(query).unwrap(); assert_eq!(result.len(), 3, "got {:?}", result); let mut holder: HashSet = HashSet::new(); for rec in result.iter() { @@ -149,8 +155,9 @@ fn does_query_work_with_greater_than_equal() { #[test] fn can_query_use_multiple_fields() { let mut mtt = MoreThanText::new(); + let client = mtt.client(); let test_doc = TestDocument::new(vec![FieldType::StaticString, FieldType::StaticString]); - mtt.create_document(test_doc.get_docdef()).unwrap(); + client.create_document(test_doc.get_docdef()).unwrap(); let input = vec![ vec!["a", "a"], vec!["a", "b"], @@ -171,7 +178,7 @@ fn can_query_use_multiple_fields() { let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc1); query.add(test_doc.get_field_name(1), calc2); - let results = mtt.records(query).unwrap(); + let results = client.records(query).unwrap(); assert_eq!(results.len(), 1, "got {:?}", results); let rec = results.iter().last().unwrap(); assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), "a".into()); @@ -181,6 +188,7 @@ fn can_query_use_multiple_fields() { #[test] fn can_query_use_multiple_indexed_fields() { let mut mtt = MoreThanText::new(); + let client = mtt.client(); let test_doc = TestDocument::new(vec![FieldType::StaticString, FieldType::StaticString]); let mut docdef = test_doc.get_docdef(); docdef @@ -189,7 +197,7 @@ fn can_query_use_multiple_indexed_fields() { docdef .add_index(&test_doc.get_field_name(1), IndexType::Index) .unwrap(); - mtt.create_document(docdef).unwrap(); + client.create_document(docdef).unwrap(); let input = vec![ vec!["a", "a"], vec!["a", "b"], @@ -210,7 +218,7 @@ fn can_query_use_multiple_indexed_fields() { let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc1); query.add(test_doc.get_field_name(1), calc2); - let results = mtt.records(query).unwrap(); + let results = client.records(query).unwrap(); assert_eq!(results.len(), 1, "got {:?}", results); let rec = results.iter().last().unwrap(); assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), "a".into()); @@ -220,12 +228,13 @@ fn can_query_use_multiple_indexed_fields() { #[test] fn can_query_use_multiple_mixed_index_fields() { let mut mtt = MoreThanText::new(); + let client = mtt.client(); let test_doc = TestDocument::new(vec![FieldType::StaticString, FieldType::StaticString]); let mut docdef = test_doc.get_docdef(); docdef .add_index(&test_doc.get_field_name(0), IndexType::Index) .unwrap(); - mtt.create_document(docdef).unwrap(); + client.create_document(docdef).unwrap(); let input = vec![ vec!["a", "a"], vec!["a", "b"], @@ -246,7 +255,7 @@ fn can_query_use_multiple_mixed_index_fields() { let mut query = Query::new(test_doc.get_doc_name()); query.add(test_doc.get_field_name(0), calc1); query.add(test_doc.get_field_name(1), calc2); - let results = mtt.records(query).unwrap(); + let results = client.records(query).unwrap(); assert_eq!(results.len(), 1, "got {:?}", results); let rec = results.iter().last().unwrap(); assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), "a".into()); @@ -256,10 +265,11 @@ fn can_query_use_multiple_mixed_index_fields() { #[test] fn does_it_error_on_bad_field_name() { let mut mtt = MoreThanText::new(); + let client = mtt.client(); let doc_name = Name::english("holder"); let field_name = Name::english("missing"); let docdef = DocDef::new(doc_name.clone()); - mtt.create_document(docdef); + client.create_document(docdef); let mut calc = Calculation::new(Operand::Equal); calc.add_value("a").unwrap(); calc.add_value(CalcValue::Existing(FieldType::StaticString)) @@ -269,15 +279,16 @@ fn does_it_error_on_bad_field_name() { let mut expected = MTTError::new(ErrorID::NameNotFound(field_name.clone().into())); expected.add_parent(ErrorID::Field(field_name.clone().into())); expected.add_parent(ErrorID::Document(doc_name.clone().into())); - let result = mtt.records(qry).unwrap_err(); + let result = client.records(qry).unwrap_err(); assert_eq!(result.to_string(), expected.to_string()); } #[test] fn does_it_error_on_bad_field_type() { let mut mtt = MoreThanText::new(); + let client = mtt.client(); let test_doc = TestDocument::new(vec![FieldType::Uuid]); - mtt.create_document(test_doc.get_docdef()); + client.create_document(test_doc.get_docdef()); let mut calc = Calculation::new(Operand::Equal); calc.add_value("a").unwrap(); calc.add_value(CalcValue::Existing(FieldType::StaticString)) @@ -287,7 +298,7 @@ fn does_it_error_on_bad_field_type() { let mut expected = MTTError::new(ErrorID::FieldTypeExpected(FieldType::Uuid)); expected.add_parent(ErrorID::Field(test_doc.get_field_name(0).into())); expected.add_parent(ErrorID::Document(test_doc.get_doc_name().clone().into())); - let result = mtt.records(qry).unwrap_err(); + let result = client.records(qry).unwrap_err(); assert_eq!(result.to_string(), expected.to_string()); } @@ -296,6 +307,7 @@ fn does_query_send_on_query_message() { let selected = 2; let (mut test_env, test_doc) = setup_range(3); let mut mtt = test_env.get_morethantext(); + let client = mtt.client(); test_env.register_channel(vec![Path::new( Include::All, Include::Just(test_doc.get_doc_name().into()), @@ -307,7 +319,7 @@ fn does_query_send_on_query_message() { .unwrap(); let mut qry = Query::new(test_doc.get_doc_name()); qry.add(test_doc.get_field_name(0), calc); - let query_result = mtt.records(qry).unwrap(); + let query_result = client.records(qry).unwrap(); let trigger_result = test_env.get_trigger_records(Action::OnQuery); assert_eq!(trigger_result.len(), query_result.len()); assert_eq!(