FIX: small diverse fixes (#35)

xlsx/tests/test.rs

@@ -3,33 +3,32 @@ use uuid::Uuid;
 
 use ironcalc::compare::{test_file, test_load_and_saving};
 use ironcalc::export::save_to_xlsx;
-use ironcalc::import::{load_from_excel, load_model_from_xlsx};
-use ironcalc_base::types::{HorizontalAlignment, VerticalAlignment, Workbook};
+use ironcalc::import::{load_from_icalc, load_from_xlsx};
+use ironcalc_base::types::{HorizontalAlignment, VerticalAlignment};
 use ironcalc_base::Model;
 
 // This is a functional test.
 // We check that the output of example.xlsx is what we expect.
 #[test]
 fn test_example() {
-    let model = load_from_excel("tests/example.xlsx", "en", "UTC").unwrap();
-    assert_eq!(model.worksheets[0].frozen_rows, 0);
-    assert_eq!(model.worksheets[0].frozen_columns, 0);
-    let contents =
-        fs::read_to_string("tests/example.json").expect("Something went wrong reading the file");
-    let model2: Workbook = serde_json::from_str(&contents).unwrap();
-    let s = serde_json::to_string(&model).unwrap();
-    assert_eq!(model, model2, "{s}");
+    let model = load_from_xlsx("tests/example.xlsx", "en", "UTC").unwrap();
+    let workbook = model.workbook;
+    assert_eq!(workbook.worksheets[0].frozen_rows, 0);
+    assert_eq!(workbook.worksheets[0].frozen_columns, 0);
+    let model2 = load_from_icalc("tests/example.ic").unwrap();
+    let s = bitcode::encode(&model2.workbook);
+    assert_eq!(workbook, model2.workbook, "{:?}", s);
 }
 
 #[test]
 fn test_save_to_xlsx() {
-    let mut model = load_model_from_xlsx("tests/example.xlsx", "en", "UTC").unwrap();
+    let mut model = load_from_xlsx("tests/example.xlsx", "en", "UTC").unwrap();
     model.evaluate();
     let temp_file_name = "temp_file_example.xlsx";
     // test can safe
     save_to_xlsx(&model, temp_file_name).unwrap();
     // test can open
-    let model = load_model_from_xlsx(temp_file_name, "en", "UTC").unwrap();
+    let model = load_from_xlsx(temp_file_name, "en", "UTC").unwrap();
     let metadata = &model.workbook.metadata;
     assert_eq!(metadata.application, "IronCalc Sheets");
     // FIXME: This will need to be updated once we fix versioning
@@ -41,7 +40,9 @@ fn test_save_to_xlsx() {
 #[test]
 fn test_freeze() {
     // freeze has 3 frozen columns and 2 frozen rows
-    let model = load_from_excel("tests/freeze.xlsx", "en", "UTC").unwrap();
+    let model = load_from_xlsx("tests/freeze.xlsx", "en", "UTC")
+        .unwrap()
+        .workbook;
     assert_eq!(model.worksheets[0].frozen_rows, 2);
     assert_eq!(model.worksheets[0].frozen_columns, 3);
 }
@@ -49,7 +50,9 @@ fn test_freeze() {
 #[test]
 fn test_split() {
     // We test that a workbook with split panes do not produce frozen rows and columns
-    let model = load_from_excel("tests/split.xlsx", "en", "UTC").unwrap();
+    let model = load_from_xlsx("tests/split.xlsx", "en", "UTC")
+        .unwrap()
+        .workbook;
     assert_eq!(model.worksheets[0].frozen_rows, 0);
     assert_eq!(model.worksheets[0].frozen_columns, 0);
 }
@@ -145,14 +148,14 @@ fn test_model_has_correct_styles(model: &Model) {
 
 #[test]
 fn test_simple_text() {
-    let model = load_model_from_xlsx("tests/basic_text.xlsx", "en", "UTC").unwrap();
+    let model = load_from_xlsx("tests/basic_text.xlsx", "en", "UTC").unwrap();
 
     test_model_has_correct_styles(&model);
 
     let temp_file_name = "temp_file_test_named_styles.xlsx";
     save_to_xlsx(&model, temp_file_name).unwrap();
 
-    let model = load_model_from_xlsx(temp_file_name, "en", "UTC").unwrap();
+    let model = load_from_xlsx(temp_file_name, "en", "UTC").unwrap();
     fs::remove_file(temp_file_name).unwrap();
     test_model_has_correct_styles(&model);
 }
@@ -160,7 +163,9 @@ fn test_simple_text() {
 #[test]
 fn test_defined_names_casing() {
     let test_file_path = "tests/calc_tests/defined_names_for_unit_test.xlsx";
-    let loaded_workbook = load_from_excel(test_file_path, "en", "UTC").unwrap();
+    let loaded_workbook = load_from_xlsx(test_file_path, "en", "UTC")
+        .unwrap()
+        .workbook;
     let mut model = Model::from_bytes(&bitcode::encode(&loaded_workbook)).unwrap();
 
     let (row, column) = (2, 13); // B13