Adding more tests for cur_dir functions

Author: RenTrieu

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

@@ -61,7 +61,7 @@ pub fn test() {
     assert_eq!(status, Status::SUCCESS);
     assert!(shell.get_env(Some(test_var)).is_none());
 
-    /* Test setting and getting current file system and directory */
+    /* Test setting and getting current file system and current directory */
     let mut fs_buf = [0u16; 16];
     let fs_var = CStr16::from_str_with_buf("fs0:", &mut fs_buf).unwrap();
     let mut dir_buf = [0u16; 32];
@@ -75,6 +75,7 @@ pub fn test() {
     let expected_fs_str = CStr16::from_str_with_buf("FS0:\\", &mut test_buf).unwrap();
     assert_eq!(cur_fs_str, expected_fs_str);
 
+    // Changing current file system
     let fs_var = CStr16::from_str_with_buf("fs1:", &mut fs_buf).unwrap();
     let dir_var = CStr16::from_str_with_buf("/", &mut dir_buf).unwrap();
     let status = shell.set_cur_dir(Some(fs_var), Some(dir_var));
@@ -87,6 +88,7 @@ pub fn test() {
     let expected_fs_str = CStr16::from_str_with_buf("FS1:\\", &mut test_buf).unwrap();
     assert_eq!(cur_fs_str, expected_fs_str);
 
+    // Changing current file system and current directory
     let fs_var = CStr16::from_str_with_buf("fs0:", &mut fs_buf).unwrap();
     let dir_var = CStr16::from_str_with_buf("efi/", &mut dir_buf).unwrap();
     let status = shell.set_cur_dir(Some(fs_var), Some(dir_var));
@@ -99,7 +101,13 @@ pub fn test() {
     let expected_fs_str = CStr16::from_str_with_buf("FS0:\\efi", &mut test_buf).unwrap();
     assert_eq!(cur_fs_str, expected_fs_str);
 
-    /* Test NULL file system cases */
+    /* Test current working directory cases */
+
+    // At this point, the current working file system has not been set
+    // So we expect a NULL output
+    assert!(shell.get_cur_dir(None).is_none());
+
+    // Setting the current working file system and current working directory
     let dir_var = CStr16::from_str_with_buf("fs0:/", &mut dir_buf).unwrap();
     let status = shell.set_cur_dir(None, Some(dir_var));
     assert_eq!(status, Status::SUCCESS);
@@ -114,6 +122,7 @@ pub fn test() {
         .expect("Could not get the current file system mapping");
     assert_eq!(cur_fs_str, expected_fs_str);
 
+    // Changing current working directory
     let dir_var = CStr16::from_str_with_buf("/efi", &mut dir_buf).unwrap();
     let status = shell.set_cur_dir(None, Some(dir_var));
     assert_eq!(status, Status::SUCCESS);
@@ -122,6 +131,26 @@ pub fn test() {
         .expect("Could not get the current file system mapping");
     let expected_fs_str = CStr16::from_str_with_buf("FS0:\\efi", &mut test_buf).unwrap();
     assert_eq!(cur_fs_str, expected_fs_str);
+    let cur_fs_str = shell
+        .get_cur_dir(None)
+        .expect("Could not get the current file system mapping");
+    assert_eq!(cur_fs_str, expected_fs_str);
+
+    // Changing current directory in a non-current working file system
+    let fs_var = CStr16::from_str_with_buf("fs0:", &mut fs_buf).unwrap();
+    let dir_var = CStr16::from_str_with_buf("efi/tools", &mut dir_buf).unwrap();
+    let status = shell.set_cur_dir(Some(fs_var), Some(dir_var));
+    assert_eq!(status, Status::SUCCESS);
+    let cur_fs_str = shell
+        .get_cur_dir(None)
+        .expect("Could not get the current file system mapping");
+    assert_ne!(cur_fs_str, expected_fs_str);
+
+    let expected_fs_str = CStr16::from_str_with_buf("FS0:\\efi\\tools", &mut test_buf).unwrap();
+    let cur_fs_str = shell
+        .get_cur_dir(Some(fs_var))
+        .expect("Could not get the current file system mapping");
+    assert_eq!(cur_fs_str, expected_fs_str);
 
     // Create a file
     // let status = shell.create_file(test_str, 0).expect("Could not create file");