diff --git a/crates/engine/src/tests_fontfiles.rs b/crates/engine/src/tests_fontfiles.rs index 079d9322..72e21755 100644 --- a/crates/engine/src/tests_fontfiles.rs +++ b/crates/engine/src/tests_fontfiles.rs @@ -170,7 +170,7 @@ fn a_search_finds_a_missing_fonts_file_by_its_names() { let id = r["id"].clone(); let r = finished(&mut s); assert_eq!((&r["state"], &r["id"], r.get("stopped")), (&json!("done"), &id, None), "{r}"); - let found = root.join("x/y/Findme.otf").to_string_lossy().into_owned(); + let found = root.join("x").join("y").join("Findme.otf").to_string_lossy().into_owned(); let findme = r["fonts"].as_array().unwrap().iter().find(|f| f["family"] == "Findme Sans 3").cloned().unwrap(); assert_eq!((findme["status"].as_str(), findme["files"].clone()), (Some("missing"), json!([found]))); assert_eq!(r["searched"]["fontFiles"], 2, "the font files are read, not the text file: {r}"); @@ -360,7 +360,7 @@ fn only_font_files_are_copied() { #[test] fn a_search_skips_font_files_too_large_to_add() { let root = folder("too-large"); - let (big, small) = (root.join("big/Sizeme.otf"), root.join("small/Sizeme.otf")); + let (big, small) = (root.join("big").join("Sizeme.otf"), root.join("small").join("Sizeme.otf")); let font = vectorcraft_testkit::fonts::renamed("Sizeme Sans 3"); for path in [&big, &small] { std::fs::create_dir_all(path.parent().unwrap()).unwrap(); diff --git a/crates/engine/tests/font_folder.rs b/crates/engine/tests/font_folder.rs index 379daa08..64581651 100644 --- a/crates/engine/tests/font_folder.rs +++ b/crates/engine/tests/font_folder.rs @@ -31,7 +31,7 @@ fn a_found_font_is_copied_without_replacing_a_file_and_its_type_redraws() { let fonts = root.join("App Fonts"); vectorcraft_text::set_app_font_dir(fonts.clone()); assert!(vectorcraft_text::system_font_dirs().contains(&fonts)); - let file = root.join("Downloads/Deep/Findme.otf"); + let file = root.join("Downloads").join("Deep").join("Findme.otf"); std::fs::write(&file, vectorcraft_testkit::fonts::renamed("Findme Sans 3")).unwrap(); let serif = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../assets/fonts/SourceSerif4-Regular.ttf"); std::fs::copy(serif, root.join("other.ttf")).unwrap(); diff --git a/crates/ui-egui/src/dialogs/missing_fonts.rs b/crates/ui-egui/src/dialogs/missing_fonts.rs index 5e329f9d..8692427c 100644 --- a/crates/ui-egui/src/dialogs/missing_fonts.rs +++ b/crates/ui-egui/src/dialogs/missing_fonts.rs @@ -489,7 +489,7 @@ mod tests { #[test] fn the_documents_fonts_folder_is_offered_and_searched_off_the_ui_thread() { let root = folder("package"); - let font = root.join("pkg/Fonts/sub/Findme.otf"); + let font = root.join("pkg").join("Fonts").join("sub").join("Findme.otf"); std::fs::create_dir_all(font.parent().unwrap()).unwrap(); std::fs::write(&font, vectorcraft_testkit::fonts::renamed("Findme Sans 3")).unwrap(); let mut app = app_for(&root); @@ -497,7 +497,7 @@ mod tests { save_doc(&mut app, &doc, "Findme Sans 3", false); open(&mut app, &doc); let next = app.ui.dialog.as_ref().filter(|d| d.kind == KIND).expect("Missing Fonts at once: no links missing").str("fontsNextToDocument"); - assert_eq!(next, root.join("pkg/Fonts").to_string_lossy()); + assert_eq!(next, root.join("pkg").join("Fonts").to_string_lossy()); assert!(frame(&mut app).contains("Search Fonts Folder")); app.ui.dialog.as_mut().unwrap().fields.insert("searchFolder".into(), json!(next)); let r = super::super::confirm(&mut app).unwrap();