uefi-fs: add integration test

Author: phip1611

uefi-test-runner/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2021"
 # TODO we should let the uefi-test-runner run with and without unstable.
 uefi = { path = "../uefi", features = ["alloc", "unstable"] }
 uefi-services = { path = "../uefi-services" }
+uefi-fs = { path = "../uefi-fs" }
 
 log = { version = "0.4.17", default-features = false }
 

uefi-test-runner/src/fs/mod.rs

@@ -0,0 +1,37 @@
+use alloc::string::{String, ToString};
+use alloc::vec::Vec;
+use uefi::prelude::*;
+
+use uefi::proto::loaded_image::LoadedImage;
+use uefi::proto::media::file::{Directory, File, FileAttribute, FileMode, FileSystemInfo};
+use uefi::proto::media::fs::SimpleFileSystem;
+use uefi::table::boot::ScopedProtocol;
+use uefi::{proto, Identify};
+use uefi_fs::{FileSystem, FileSystemError};
+
+/// Tests functionality from the `uefi-fs` crate.
+pub fn test(sfs: ScopedProtocol<SimpleFileSystem>) {
+    let mut fs = FileSystem::new(sfs);
+
+    fs.create_dir("test_file_system_abs").unwrap();
+
+    // slash is transparently transformed to backslash
+    fs.write("test_file_system_abs/foo", "hello").unwrap();
+    // absolute or relative paths are supported; ./ is ignored
+    fs.copy("\\test_file_system_abs/foo", "\\test_file_system_abs/./bar").unwrap();
+    let read = fs.read("\\test_file_system_abs\\bar").unwrap();
+    let read = String::from_utf8(read).unwrap();
+    assert_eq!(read, "hello");
+
+    assert_eq!(
+        fs.try_exists("test_file_system_abs\\barfoo"),
+        Err(FileSystemError::OpenError("\\test_file_system_abs\\barfoo".to_string()))
+    );
+    fs.rename("test_file_system_abs\\bar", "test_file_system_abs\\barfoo").unwrap();
+    assert!(fs.try_exists("test_file_system_abs\\barfoo").is_ok());
+
+    let entries = fs.read_dir("test_file_system_abs").unwrap()
+        .map(|e| e.unwrap().file_name().to_string())
+        .collect::<Vec<_>>();
+    assert_eq!(&[".", "..", "foo", "barfoo"], entries.as_slice());
+}

uefi-test-runner/src/main.rs

@@ -8,12 +8,14 @@ extern crate log;
 extern crate alloc;
 
 use alloc::string::ToString;
+use core::ptr::hash;
 use uefi::prelude::*;
 use uefi::proto::console::serial::Serial;
 use uefi::Result;
 use uefi_services::{print, println};
 
 mod boot;
+mod fs;
 mod proto;
 mod runtime;
 

uefi-test-runner/src/proto/media/known_disk.rs

@@ -339,6 +339,8 @@ pub fn test_known_disk(bt: &BootServices) {
             test_delete_warning(&mut root_directory);
             test_existing_file(&mut root_directory);
             test_create_file(&mut root_directory);
+
+            crate::fs::test(sfs)
         }
 
         test_raw_disk_io(handle, bt);