From 8c52d3679da34284940b291f092694a7c8f8a09e Mon Sep 17 00:00:00 2001 From: Tiffany Bennett Date: Mon, 27 May 2024 16:34:13 -0700 Subject: [PATCH] more tests --- core/src/parsing/text_query.rs | 2 +- core/tests/query.rs | 35 ++++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/core/src/parsing/text_query.rs b/core/src/parsing/text_query.rs index 8f7d7a5..2331fa8 100644 --- a/core/src/parsing/text_query.rs +++ b/core/src/parsing/text_query.rs @@ -836,7 +836,7 @@ pub fn parse_query(iter: &mut Iter<'_>) -> Query { _ => Digits::FullInt, } } - Token::Ident(ref s) if s == "frac" || s == "fraction" => { + Token::Ident(ref s) if s == "frac" || s == "fraction" || s == "ratio" => { iter.next(); Digits::Fraction } diff --git a/core/tests/query.rs b/core/tests/query.rs index 4d73c6b..4399239 100644 --- a/core/tests/query.rs +++ b/core/tests/query.rs @@ -817,7 +817,12 @@ fn test_output_formats() { test("1 to frac", "1 (dimensionless)"); test("1 to sci", "1.0e0 (dimensionless)"); test("1/7 to frac", "1/7 (dimensionless)"); + test("1/7 to fraction", "1/7 (dimensionless)"); + test("1/7 to ratio", "1/7 (dimensionless)"); test("1/7 to sci", "1.[428571]...e-1 (dimensionless)"); + test("1/7 to scientific", "1.[428571]...e-1 (dimensionless)"); + test("0.5 to eng", "0.5 (dimensionless)"); + test("0.5 to engineering", "0.5 (dimensionless)"); // engineering test("1e9 to eng", "1.0e9 (dimensionless)"); @@ -841,10 +846,28 @@ fn test_output_formats() { #[test] fn conversion_to_digit_errors() { - test("egg to digits", "<1 (dimensionless) egg> to digits is not defined"); - test("egg to digits 50", "<1 (dimensionless) egg> to 50 digits is not defined"); - test("egg to frac", "<1 (dimensionless) egg> to fraction is not defined"); - test("egg to sci", "<1 (dimensionless) egg> to scientific is not defined"); - test("egg to eng", "<1 (dimensionless) egg> to engineering is not defined"); - test("now to digits \"US/Pacific\"", "Conversion to digits of US/Pacific is not defined"); + test( + "egg to digits", + "<1 (dimensionless) egg> to digits is not defined", + ); + test( + "egg to digits 50", + "<1 (dimensionless) egg> to 50 digits is not defined", + ); + test( + "egg to frac", + "<1 (dimensionless) egg> to fraction is not defined", + ); + test( + "egg to sci", + "<1 (dimensionless) egg> to scientific is not defined", + ); + test( + "egg to eng", + "<1 (dimensionless) egg> to engineering is not defined", + ); + test( + "now to digits \"US/Pacific\"", + "Conversion to digits of US/Pacific is not defined", + ); }