Update file handler mod tests

[rbdr/page] / src / file_handler / mod.rs

diff --git a/src/file_handler/mod.rs b/src/file_handler/mod.rs
index 8ba50d490c64335d84d4a55dd0e8de1fb77441b8..cefe6a20b374072dd735e4be19922fb2f7cfc8ba 100644 (file)
--- a/src/file_handler/mod.rs
+++ b/src/file_handler/mod.rs
@@ -94,10 +94,13 @@ pub struct File {
 
 #[cfg(test)]
 mod tests {
 
 #[cfg(test)]
 mod tests {

-    use super::*;

     use std::path::PathBuf;
 
     use std::path::PathBuf;
 

-    fn create_test_file(path: &str, file_type: FileType) -> File {
+    use super::*;
+
+    use test_utilities::*;
+
+    fn create_test_internal_file(path: &str, file_type: FileType) -> File {

         File {
             path: PathBuf::from(path),
             file_type,
         File {
             path: PathBuf::from(path),
             file_type,


@@ -128,17 +131,21 @@ mod tests {
     #[test]
     fn test_identify_unknown_file() {
         let handler = FileHandler::default();
     #[test]
     fn test_identify_unknown_file() {
         let handler = FileHandler::default();

-        let path = PathBuf::from("tests/fixtures");
+        let path = PathBuf::from("tests");

         assert!(matches!(handler.identify(&path), FileType::Unknown));
     }
 
     #[test]
     fn test_get_layout_success() {
         assert!(matches!(handler.identify(&path), FileType::Unknown));
     }
 
     #[test]
     fn test_get_layout_success() {

+        let test_dir = setup_test_dir();
+        let layout_path = test_dir.join("_layout.html");
+        create_test_file(&layout_path, "");
+

         let mut handler = FileHandler::default();
         let files = vec![
         let mut handler = FileHandler::default();
         let files = vec![

-            create_test_file("test.gmi", FileType::Gemini),
-            create_test_file("tests/fixtures/_layout.html", FileType::Layout),
-            create_test_file("regular.html", FileType::File),
+            create_test_internal_file("test.gmi", FileType::Gemini),
+            create_test_internal_file(&layout_path.to_str().expect("Could not encode layout"), FileType::Layout),
+            create_test_internal_file("regular.html", FileType::File),

         ];
 
         assert!(handler.get_layout_or_panic(&files).is_ok());
         ];
 
         assert!(handler.get_layout_or_panic(&files).is_ok());


@@ -148,8 +155,8 @@ mod tests {
     fn test_get_layout_failure() {
         let mut handler = FileHandler::default();
         let files = vec![
     fn test_get_layout_failure() {
         let mut handler = FileHandler::default();
         let files = vec![

-            create_test_file("test.gmi", FileType::Gemini),
-            create_test_file("regular.html", FileType::File),
+            create_test_internal_file("test.gmi", FileType::Gemini),
+            create_test_internal_file("regular.html", FileType::File),

         ];
 
         assert!(handler.get_layout_or_panic(&files).is_err());
         ];
 
         assert!(handler.get_layout_or_panic(&files).is_err());


@@ -213,7 +220,7 @@ mod tests {
         let mut handler = FileHandler::default();
         handler.layout = Some("test layout".to_string());
 
         let mut handler = FileHandler::default();
         handler.layout = Some("test layout".to_string());
 

-        let file = create_test_file("tests/fixtures/test1.gmi", FileType::Gemini);
+        let file = create_test_internal_file("tests/fixtures/test1.gmi", FileType::Gemini);

 
         // Should not panic with valid layout
         handler.handle(
 
         // Should not panic with valid layout
         handler.handle(


@@ -228,7 +235,7 @@ mod tests {
     #[should_panic(expected = "Layout should be initialized before handling files")]
     fn test_handle_without_layout() {
         let handler = FileHandler::default();
     #[should_panic(expected = "Layout should be initialized before handling files")]
     fn test_handle_without_layout() {
         let handler = FileHandler::default();

-        let file = create_test_file("test.gmi", FileType::Gemini);
+        let file = create_test_internal_file("test.gmi", FileType::Gemini);

 
         handler.handle(
             &PathBuf::from("source"),
 
         handler.handle(
             &PathBuf::from("source"),


@@ -240,12 +247,16 @@ mod tests {
 
     #[test]
     fn test_slice_handling() {
 
     #[test]
     fn test_slice_handling() {

+        let test_dir = setup_test_dir();
+        let layout_path = test_dir.join("_layout.html");
+        create_test_file(&layout_path, "");
+

         let mut handler = FileHandler::default();
         let files = vec![
         let mut handler = FileHandler::default();
         let files = vec![

-            create_test_file("tests/fixtures/test1.gmi", FileType::Gemini),
-            create_test_file("tests/fixtures/_layout.html", FileType::Layout),
-            create_test_file("tests/fixtures/test2.gmi", FileType::Gemini),
-            create_test_file("tests/fixtures/test3.gmi", FileType::Gemini),
+            create_test_internal_file("tests/fixtures/test1.gmi", FileType::Gemini),
+            create_test_internal_file(&layout_path.to_str().expect("Could not encode layout"), FileType::Layout),
+            create_test_internal_file("tests/fixtures/test2.gmi", FileType::Gemini),
+            create_test_internal_file("tests/fixtures/test3.gmi", FileType::Gemini),

         ];
 
         let _ = handler.get_layout_or_panic(&files[1..]);
         ];
 
         let _ = handler.get_layout_or_panic(&files[1..]);