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/pin.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/tests/pin.rs') diff --git a/src/tests/pin.rs b/src/tests/pin.rs index 958a36d..87c9064 100644 --- a/src/tests/pin.rs +++ b/src/tests/pin.rs @@ -35,7 +35,10 @@ fn unblock(model: nitrokey::Model) -> crate::Result<()> { assert!(device.get_user_retry_count()? < 3); } - let _ = Nitrocli::with_model(model).handle(&["pin", "unblock"])?; + let _ = Nitrocli::make() + .model(model) + .build() + .handle(&["pin", "unblock"])?; { let mut manager = nitrokey::force_take()?; @@ -47,7 +50,7 @@ fn unblock(model: nitrokey::Model) -> crate::Result<()> { #[test_device] fn set_user(model: nitrokey::Model) -> crate::Result<()> { - let mut ncli = Nitrocli::with_model(model); + let mut ncli = Nitrocli::make().model(model).build(); // Set a new user PIN. ncli.new_user_pin("new-pin"); let out = ncli.handle(&["pin", "set", "user"])?; -- cgit v1.2.1