From 0cc4371d138d5e98cd22813f10689cb089eef378 Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Mon, 24 Aug 2020 18:04:20 -0700 Subject: 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. --- src/tests/reset.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/tests/reset.rs') diff --git a/src/tests/reset.rs b/src/tests/reset.rs index bf1e75b..9934284 100644 --- a/src/tests/reset.rs +++ b/src/tests/reset.rs @@ -11,10 +11,9 @@ use super::*; #[test_device] fn reset(model: nitrokey::Model) -> anyhow::Result<()> { let new_admin_pin = "87654321"; - let mut ncli = Nitrocli::with_model(model); + let mut ncli = Nitrocli::new().model(model).new_admin_pin(new_admin_pin); // Change the admin PIN. - ncli.new_admin_pin(new_admin_pin); let _ = ncli.handle(&["pin", "set", "admin"])?; { @@ -25,7 +24,7 @@ fn reset(model: nitrokey::Model) -> anyhow::Result<()> { } // Perform factory reset - ncli.admin_pin(new_admin_pin); + let mut ncli = ncli.admin_pin(new_admin_pin); let out = ncli.handle(&["reset"])?; assert!(out.is_empty()); -- cgit v1.2.1