From 3c774dcf6c02e3486c913252072c7e02833ce1e5 Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 11 Sep 2019 12:21:15 +1000 Subject: [PATCH] Add stricter assertions to whoami test --- rsidm_client/tests/proto_v1_test.rs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/rsidm_client/tests/proto_v1_test.rs b/rsidm_client/tests/proto_v1_test.rs index f94fd528a..24ce8fe98 100644 --- a/rsidm_client/tests/proto_v1_test.rs +++ b/rsidm_client/tests/proto_v1_test.rs @@ -120,10 +120,12 @@ fn test_server_whoami_anonymous() { assert!(res.is_ok()); // Now do a whoami. - let post_res = rsclient.whoami().unwrap(); - assert!(post_res.is_some()); - // TODO: Now unwrap and ensure anony - println!("{:?}", post_res); + let (_e, uat) = match rsclient.whoami().unwrap() { + Some((e, uat)) => (e, uat), + None => panic!(), + }; + debug!("{}", uat); + assert!(uat.name == "anonymous"); }); } @@ -139,10 +141,12 @@ fn test_server_whoami_admin_simple_password() { assert!(res.is_ok()); // Now do a whoami. - let post_res = rsclient.whoami().unwrap(); - assert!(post_res.is_some()); - // TODO: Now unwrap and ensure anony - debug!("{:?}", post_res); + let (_e, uat) = match rsclient.whoami().unwrap() { + Some((e, uat)) => (e, uat), + None => panic!(), + }; + debug!("{}", uat); + assert!(uat.name == "admin"); }); }