Fixes tests

Author: ultimaweapon

src/console.rs

@@ -7,10 +7,9 @@ use core::fmt::Write;
 #[macro_export]
 macro_rules! println {
     ($($args:tt)*) => {{
-        use $crate::SystemTable;
         use ::core::fmt::Write;
 
-        let mut dev = SystemTable::current().stdout();
+        let mut dev = $crate::system_table().stdout();
 
         dev.write_fmt(::core::format_args!($($args)*)).unwrap();
         dev.write_eol().unwrap();
@@ -21,10 +20,9 @@ macro_rules! println {
 #[macro_export]
 macro_rules! eprintln {
     ($($args:tt)*) => {{
-        use $crate::SystemTable;
         use ::core::fmt::Write;
 
-        let mut dev = SystemTable::current().stderr();
+        let mut dev = $crate::system_table().stderr();
 
         dev.write_fmt(::core::format_args!($($args)*)).unwrap();
         dev.write_eol().unwrap();

tests/filesystem.rs

@@ -3,9 +3,9 @@ use zfi_testing::qemu;
 #[test]
 #[qemu]
 fn file_info() {
-    use zfi::{FileAttributes, FileModes, Image};
+    use zfi::{current_image, FileAttributes, FileModes};
 
-    let image = Image::current().proto();
+    let image = current_image().proto();
     let fs = image.device().file_system().unwrap();
     let root = fs.open().unwrap();
     let file = root
@@ -25,9 +25,9 @@ fn file_info() {
 #[test]
 #[qemu]
 fn create() {
-    use zfi::{str, FileAttributes, Image};
+    use zfi::{current_image, str, FileAttributes};
 
-    let image = Image::current().proto();
+    let image = current_image().proto();
     let fs = image.device().file_system().unwrap();
     let root = fs.open().unwrap();
 

tests/image.rs

@@ -3,9 +3,9 @@ use zfi_testing::qemu;
 #[test]
 #[qemu]
 fn proto() {
-    use zfi::{str, Image, PathBuf};
+    use zfi::{current_image, str, PathBuf};
 
-    let proto = Image::current().proto();
+    let proto = current_image().proto();
     let mut path = PathBuf::new();
 
     path.push_media_file_path(if cfg!(target_arch = "x86_64") {