integration test for existing simple file system code

Author: phip1611

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

@@ -1,10 +1,13 @@
 mod known_disk;
 
 use uefi::prelude::*;
-use uefi::proto::media::file::{Directory, File, FileSystemInfo, FileSystemVolumeLabel};
+use uefi::proto::media::file::{
+    Directory, File, FileAttribute, FileMode, FileSystemInfo, FileSystemVolumeLabel, FileType,
+};
 use uefi::proto::media::fs::SimpleFileSystem;
 use uefi::proto::media::partition::PartitionInfo;
 use uefi::table::boot::{OpenProtocolAttributes, OpenProtocolParams};
+use uefi::CString16;
 
 /// Test `FileSystemInfo` and `FileSystemVolumeLabel`.
 fn test_file_system_info(directory: &mut Directory) {
@@ -24,8 +27,8 @@ fn test_file_system_info(directory: &mut Directory) {
     assert_eq!(fs_info.volume_label(), fs_vol.volume_label());
 }
 
-pub fn test(image: Handle, bt: &BootServices) {
-    info!("Testing Media Access protocols");
+pub fn test_simple_file_system_protocol(image: Handle, bt: &BootServices) {
+    info!("Testing Simple File System Protocol");
 
     if let Ok(handle) = bt.get_handle_for_protocol::<SimpleFileSystem>() {
         let mut sfs = bt
@@ -39,10 +42,10 @@ pub fn test(image: Handle, bt: &BootServices) {
             )
             .expect("failed to open SimpleFileSystem protocol");
 
-        let mut directory = sfs.open_volume().unwrap();
+        let mut root_directory = sfs.open_volume().unwrap();
         let mut buffer = vec![0; 128];
         loop {
-            let file_info = match directory.read_entry(&mut buffer) {
+            let file_info = match root_directory.read_entry(&mut buffer) {
                 Ok(info) => {
                     if let Some(info) = info {
                         info
@@ -60,12 +63,35 @@ pub fn test(image: Handle, bt: &BootServices) {
             };
             info!("Root directory entry: {:?}", file_info);
         }
-        directory.reset_entry_readout().unwrap();
+        root_directory.reset_entry_readout().unwrap();
 
-        test_file_system_info(&mut directory);
+        test_file_system_info(&mut root_directory);
+
+        assert_eq!(Ok(true), root_directory.is_directory());
+        assert_eq!(Ok(false), root_directory.is_regular_file());
+
+        info!("creating file in root volume");
+        let created_file = root_directory
+            .open(
+                CString16::try_from("foo").unwrap().as_ref(),
+                FileMode::CreateReadWrite,
+                FileAttribute::empty(),
+            )
+            .unwrap();
+        assert_eq!(Ok(true), created_file.is_regular_file());
+        let created_file = match created_file.into_type().unwrap() {
+            FileType::Regular(file) => file,
+            _ => panic!("unsupported value"),
+        };
+        assert_eq!(Ok(true), created_file.is_regular_file());
+        assert_eq!(Ok(false), created_file.is_directory());
     } else {
         warn!("`SimpleFileSystem` protocol is not available");
     }
+}
+
+pub fn test_partition_info_protocol(image: Handle, bt: &BootServices) {
+    info!("Testing Partition Info protocols");
 
     let handles = bt
         .find_handles::<PartitionInfo>()

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

@@ -15,7 +15,8 @@ pub fn test(image: Handle, st: &mut SystemTable<Boot>) {
     debug::test(image, bt);
     device_path::test(image, bt);
     loaded_image::test(image, bt);
-    media::test(image, bt);
+    media::test_simple_file_system_protocol(image, bt);
+    media::test_partition_info_protocol(image, bt);
     network::test(image, bt);
     pi::test(image, bt);
     rng::test(image, bt);