2 files changed, 45 insertions, 22 deletions

diff --git a/nitrocli/src/tests/status.rs b/nitrocli/src/tests/status.rs
index 83ce61f..7aac5ad 100644
--- a/nitrocli/src/tests/status.rs
+++ b/nitrocli/src/tests/status.rs
@@ -37,10 +37,10 @@ fn not_found() {
 }
 
 #[test_device]
-fn output(device: nitrokey::DeviceWrapper) -> crate::Result<()> {
+fn output_pro(device: nitrokey::Pro) -> crate::Result<()> {
   let re = regex::Regex::new(
     r#"^Status:
-  model:             (Pro|Storage)
+  model:             Pro
   serial number:     0x[[:xdigit:]]{8}
   firmware version:  \d+\.\d+
   user retry count:  [0-3]
@@ -53,3 +53,29 @@ $"#,
   assert!(re.is_match(&out), out);
   Ok(())
 }
+
+#[test_device]
+fn output_storage(device: nitrokey::Storage) -> crate::Result<()> {
+  let re = regex::Regex::new(
+    r#"^Status:
+  model:             Storage
+  serial number:     0x[[:xdigit:]]{8}
+  firmware version:  \d+\.\d+
+  user retry count:  [0-3]
+  admin retry count: [0-3]
+  Storage:
+    SD card ID:        0x[[:xdigit:]]{8}
+    firmware:          (un)?locked
+    storage keys:      (not )?created
+    volumes:
+      unencrypted:     (read-only|active|inactive)
+      encrypted:       (read-only|active|inactive)
+      hidden:          (read-only|active|inactive)
+$"#,
+  )
+  .unwrap();
+
+  let out = Nitrocli::with_dev(device).handle(&["status"])?;
+  assert!(re.is_match(&out), out);
+  Ok(())
+}
diff --git a/nitrocli/src/tests/storage.rs b/nitrocli/src/tests/storage.rs
index be933ca..5b45bdc 100644
--- a/nitrocli/src/tests/storage.rs
+++ b/nitrocli/src/tests/storage.rs
@@ -20,15 +20,6 @@
 use super::*;
 
 #[test_device]
-fn status_on_pro(device: nitrokey::Pro) {
-  let res = Nitrocli::with_dev(device).handle(&["storage", "status"]);
-  assert_eq!(
-    res.unwrap_str_err(),
-    "This command is only available on the Nitrokey Storage",
-  );
-}
-
-#[test_device]
 fn status_open_close(device: nitrokey::Storage) -> crate::Result<()> {
   fn make_re(open: Option<bool>) -> regex::Regex {
     let encrypted = match open {
@@ -42,14 +33,11 @@ fn status_open_close(device: nitrokey::Storage) -> crate::Result<()> {
       None => "(read-only|active|inactive)",
     };
     let re = format!(
-      r#"^Status:
-  SD card ID:        0x[[:xdigit:]]{{8}}
-  firmware:          (un)?locked
-  storage keys:      (not )?created
-  volumes:
-    unencrypted:     (read-only|active|inactive)
-    encrypted:       {}
-    hidden:          (read-only|active|inactive)
+      r#"
+    volumes:
+      unencrypted:     (read-only|active|inactive)
+      encrypted:       {}
+      hidden:          (read-only|active|inactive)
 $"#,
       encrypted
     );
@@ -57,21 +45,30 @@ $"#,
   }
 
   let mut ncli = Nitrocli::with_dev(device);
-  let out = ncli.handle(&["storage", "status"])?;
+  let out = ncli.handle(&["status"])?;
   assert!(make_re(None).is_match(&out), out);
 
   let _ = ncli.handle(&["storage", "open"])?;
-  let out = ncli.handle(&["storage", "status"])?;
+  let out = ncli.handle(&["status"])?;
   assert!(make_re(Some(true)).is_match(&out), out);
 
   let _ = ncli.handle(&["storage", "close"])?;
-  let out = ncli.handle(&["storage", "status"])?;
+  let out = ncli.handle(&["status"])?;
   assert!(make_re(Some(false)).is_match(&out), out);
 
   Ok(())
 }
 
 #[test_device]
+fn encrypted_open_on_pro(device: nitrokey::Pro) {
+  let res = Nitrocli::with_dev(device).handle(&["storage", "open"]);
+  assert_eq!(
+    res.unwrap_str_err(),
+    "This command is only available on the Nitrokey Storage",
+  );
+}
+
+#[test_device]
 fn encrypted_open_close(device: nitrokey::Storage) -> crate::Result<()> {
   let mut ncli = Nitrocli::with_dev(device);
   let out = ncli.handle(&["storage", "open"])?;