diff --git a/base/src/test/mod.rs b/base/src/test/mod.rs index 3cf5957..5b4ee37 100644 --- a/base/src/test/mod.rs +++ b/base/src/test/mod.rs @@ -1,4 +1,5 @@ mod test_actions; +mod test_arabic_roman; mod test_binary_search; mod test_cell; mod test_cell_clear_contents; @@ -39,6 +40,7 @@ mod test_metadata; mod test_model_cell_clear_all; mod test_model_is_empty_cell; mod test_move_formula; +mod test_mround_trunc_int; mod test_quote_prefix; mod test_row_column_styles; mod test_set_user_input; diff --git a/base/src/test/test_arabic_roman b/base/src/test/test_arabic_roman.rs similarity index 89% rename from base/src/test/test_arabic_roman rename to base/src/test/test_arabic_roman.rs index 8b328a5..703eaab 100644 --- a/base/src/test/test_arabic_roman +++ b/base/src/test/test_arabic_roman.rs @@ -6,8 +6,8 @@ use crate::test::util::new_empty_model; fn arguments() { let mut model = new_empty_model(); model._set("A1", "=ARABIC()"); - model._set("A2", "=ARABIC(V)"); - model._set("A3", "=ARABIC(V, 2)"); + model._set("A2", "=ARABIC(\"V\")"); + model._set("A3", "=ARABIC(\"V\", 2)"); model._set("A4", "=ROMAN()"); model._set("A5", "=ROMAN(5)"); diff --git a/base/src/test/test_mround_trunc_int b/base/src/test/test_mround_trunc_int.rs similarity index 95% rename from base/src/test/test_mround_trunc_int rename to base/src/test/test_mround_trunc_int.rs index c8ad72e..009a8a8 100644 --- a/base/src/test/test_mround_trunc_int +++ b/base/src/test/test_mround_trunc_int.rs @@ -20,7 +20,6 @@ fn arguments() { model._set("A11", "=INT(10.22, 1)"); model._set("A12", "=INT(10.22, 1, 2)"); - model.evaluate(); assert_eq!(model._get_text("A1"), *"#ERROR!"); @@ -29,7 +28,7 @@ fn arguments() { assert_eq!(model._get_text("A4"), *"#ERROR!"); assert_eq!(model._get_text("A5"), *"#ERROR!"); - assert_eq!(model._get_text("A6"), *"#ERROR!"); + assert_eq!(model._get_text("A6"), *"10"); assert_eq!(model._get_text("A7"), *"10.2"); assert_eq!(model._get_text("A8"), *"#ERROR!"); diff --git a/xlsx/tests/calc_tests/COMBIN_COMBINA.xlsx b/xlsx/tests/calc_tests/COMBIN_COMBINA.xlsx index b02cc12..3667843 100644 Binary files a/xlsx/tests/calc_tests/COMBIN_COMBINA.xlsx and b/xlsx/tests/calc_tests/COMBIN_COMBINA.xlsx differ diff --git a/xlsx/tests/calc_tests/COMBIN_COMBINA_detailed.xlsx b/xlsx/tests/calc_tests/COMBIN_COMBINA_detailed.xlsx deleted file mode 100644 index 3667843..0000000 Binary files a/xlsx/tests/calc_tests/COMBIN_COMBINA_detailed.xlsx and /dev/null differ diff --git a/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET 1.xlsx b/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET 1.xlsx deleted file mode 100644 index 20d7133..0000000 Binary files a/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET 1.xlsx and /dev/null differ diff --git a/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET.xlsx b/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET.xlsx index 79a07da..20d7133 100644 Binary files a/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET.xlsx and b/xlsx/tests/calc_tests/DMIN_DMAX_DAVERAGE_DSUM_DCOUNT_DGET.xlsx differ diff --git a/xlsx/tests/calc_tests/MROUND_TRUNC_INT.xlsx b/xlsx/tests/calc_tests/MROUND_TRUNC_INT.xlsx index b67610f..523ddc0 100644 Binary files a/xlsx/tests/calc_tests/MROUND_TRUNC_INT.xlsx and b/xlsx/tests/calc_tests/MROUND_TRUNC_INT.xlsx differ diff --git a/xlsx/tests/calc_tests/MROUND_edgecases.xlsx b/xlsx/tests/calc_tests/MROUND_edgecases.xlsx deleted file mode 100644 index 757ac8a..0000000 Binary files a/xlsx/tests/calc_tests/MROUND_edgecases.xlsx and /dev/null differ diff --git a/xlsx/tests/calc_tests/RADIANS_DEGREES_and_mathematical.xlsx b/xlsx/tests/calc_tests/RADIANS_DEGREES_and_mathematical.xlsx deleted file mode 100644 index 7c92faa..0000000 Binary files a/xlsx/tests/calc_tests/RADIANS_DEGREES_and_mathematical.xlsx and /dev/null differ diff --git a/xlsx/tests/calc_tests/TRUNC_INT_edgecases.xlsx b/xlsx/tests/calc_tests/TRUNC_INT_edgecases.xlsx deleted file mode 100644 index 8d81302..0000000 Binary files a/xlsx/tests/calc_tests/TRUNC_INT_edgecases.xlsx and /dev/null differ