3 files changed, 45 insertions, 24 deletions
diff --git a/nitrocli/src/tests/hidden.rs b/nitrocli/src/tests/hidden.rs
new file mode 100644
index 0000000..483a801
--- /dev/null
+++ b/nitrocli/src/tests/hidden.rs
@@ -0,0 +1,44 @@
+// hidden.rs
+
+// *************************************************************************
+// * Copyright (C) 2019 Daniel Mueller (deso@posteo.net)                   *
+// *                                                                       *
+// * This program is free software: you can redistribute it and/or modify  *
+// * it under the terms of the GNU General Public License as published by  *
+// * the Free Software Foundation, either version 3 of the License, or     *
+// * (at your option) any later version.                                   *
+// *                                                                       *
+// * This program is distributed in the hope that it will be useful,       *
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+// * GNU General Public License for more details.                          *
+// *                                                                       *
+// * You should have received a copy of the GNU General Public License     *
+// * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+// *************************************************************************
+
+use super::*;
+
+#[test_device]
+fn hidden_create_open_close(device: nitrokey::Storage) -> crate::Result<()> {
+  let mut ncli = Nitrocli::with_dev(device);
+  let out = ncli.handle(&["hidden", "create", "0", "50", "100"])?;
+  assert!(out.is_empty());
+
+  let out = ncli.handle(&["hidden", "open"])?;
+  assert!(out.is_empty());
+
+  let device = nitrokey::Storage::connect()?;
+  assert!(!device.get_status()?.encrypted_volume.active);
+  assert!(device.get_status()?.hidden_volume.active);
+  drop(device);
+
+  let out = ncli.handle(&["hidden", "close"])?;
+  assert!(out.is_empty());
+
+  let device = nitrokey::Storage::connect()?;
+  assert!(!device.get_status()?.encrypted_volume.active);
+  assert!(!device.get_status()?.hidden_volume.active);
+
+  Ok(())
+}
diff --git a/nitrocli/src/tests/mod.rs b/nitrocli/src/tests/mod.rs
index b1e1618..2d6f93c 100644
--- a/nitrocli/src/tests/mod.rs
+++ b/nitrocli/src/tests/mod.rs
@@ -37,6 +37,7 @@ const NITROKEY_DEFAULT_USER_PIN: &str = "123456";
 fn dummy() {}
 
 mod config;
+mod hidden;
 mod lock;
 mod otp;
 mod pin;
diff --git a/nitrocli/src/tests/storage.rs b/nitrocli/src/tests/storage.rs
index 5b45bdc..a1c6ecf 100644
--- a/nitrocli/src/tests/storage.rs
+++ b/nitrocli/src/tests/storage.rs
@@ -88,27 +88,3 @@ fn encrypted_open_close(device: nitrokey::Storage) -> crate::Result<()> {
 
   Ok(())
 }
-
-#[test_device]
-fn hidden_create_open_close(device: nitrokey::Storage) -> crate::Result<()> {
-  let mut ncli = Nitrocli::with_dev(device);
-  let out = ncli.handle(&["storage", "hidden", "create", "0", "50", "100"])?;
-  assert!(out.is_empty());
-
-  let out = ncli.handle(&["storage", "hidden", "open"])?;
-  assert!(out.is_empty());
-
-  let device = nitrokey::Storage::connect()?;
-  assert!(!device.get_status()?.encrypted_volume.active);
-  assert!(device.get_status()?.hidden_volume.active);
-  drop(device);
-
-  let out = ncli.handle(&["storage", "hidden", "close"])?;
-  assert!(out.is_empty());
-
-  let device = nitrokey::Storage::connect()?;
-  assert!(!device.get_status()?.encrypted_volume.active);
-  assert!(!device.get_status()?.hidden_volume.active);
-
-  Ok(())
-}