From b114125dfbb4c97580ae076c07c6816ccdca51b8 Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Mon, 24 Aug 2020 18:04:20 -0700 Subject: Introduce builder infrastructure for assembling 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 introduces a Builder struct that can be used to create such an instance in an idiomatic way. --- src/tests/lock.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tests/lock.rs') diff --git a/src/tests/lock.rs b/src/tests/lock.rs index b29f394..c5ca671 100644 --- a/src/tests/lock.rs +++ b/src/tests/lock.rs @@ -22,7 +22,7 @@ use super::*; #[test_device(pro)] fn lock_pro(model: nitrokey::Model) -> crate::Result<()> { // We can't really test much more here than just success of the command. - let out = Nitrocli::with_model(model).handle(&["lock"])?; + let out = Nitrocli::make().model(model).build().handle(&["lock"])?; assert!(out.is_empty()); Ok(()) @@ -30,7 +30,7 @@ fn lock_pro(model: nitrokey::Model) -> crate::Result<()> { #[test_device(storage)] fn lock_storage(model: nitrokey::Model) -> crate::Result<()> { - let mut ncli = Nitrocli::with_model(model); + let mut ncli = Nitrocli::make().model(model).build(); let _ = ncli.handle(&["encrypted", "open"])?; let out = ncli.handle(&["lock"])?; -- cgit v1.2.1