Introduce builder-inspired way for configuring Nitrocli instance

In the future we would like to provide more ways for tests to create a
Nitrocli instance. In order to prevent explosion of with_XXX methods for
each possible combination of arguments, this change allows for an easier
configuration of an existing object with builder-pattern-inspired
modifier methods.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/tests/pin.rs b/src/tests/pin.rs
index 7770fba..484e256 100644
--- a/src/tests/pin.rs
+++ b/src/tests/pin.rs
@@ -21,7 +21,7 @@ fn unblock(model: nitrokey::Model) -> anyhow::Result<()> {
     assert!(device.get_user_retry_count()? < 3);
   }
 
-  let _ = Nitrocli::with_model(model).handle(&["pin", "unblock"])?;
+  let _ = Nitrocli::new().model(model).handle(&["pin", "unblock"])?;
 
   {
     let mut manager = nitrokey::force_take()?;
@@ -33,9 +33,9 @@ fn unblock(model: nitrokey::Model) -> anyhow::Result<()> {
 
 #[test_device]
 fn set_user(model: nitrokey::Model) -> anyhow::Result<()> {
-  let mut ncli = Nitrocli::with_model(model);
+  let ncli = Nitrocli::new().model(model);
   // Set a new user PIN.
-  ncli.new_user_pin("new-pin");
+  let mut ncli = ncli.new_user_pin("new-pin");
   let out = ncli.handle(&["pin", "set", "user"])?;
   assert!(out.is_empty());
 
@@ -53,8 +53,9 @@ fn set_user(model: nitrokey::Model) -> anyhow::Result<()> {
   }
 
   // Revert to the default user PIN.
-  ncli.user_pin("new-pin");
-  ncli.new_user_pin(nitrokey::DEFAULT_USER_PIN);
+  let mut ncli = ncli
+    .user_pin("new-pin")
+    .new_user_pin(nitrokey::DEFAULT_USER_PIN);
 
   let out = ncli.handle(&["pin", "set", "user"])?;
   assert!(out.is_empty());