From af4414e9cbdd04f898aa735a8bb40ff16e23a4bc Mon Sep 17 00:00:00 2001 From: Folkert de Vries Date: Tue, 20 Aug 2024 13:31:00 +0200 Subject: [PATCH] simplify test code --- openadr-client/src/bin/cli.rs | 5 +---- openadr-client/src/lib.rs | 4 ++++ openadr-client/tests/basic-read.rs | 18 ++++++------------ openadr-vtn/src/api/event.rs | 7 +------ openadr-vtn/src/api/program.rs | 7 +------ openadr-vtn/src/data_source/mod.rs | 11 +++++++++++ openadr-vtn/src/main.rs | 9 ++------- 7 files changed, 26 insertions(+), 35 deletions(-) diff --git a/openadr-client/src/bin/cli.rs b/openadr-client/src/bin/cli.rs index 43dd7b9..62d0e84 100644 --- a/openadr-client/src/bin/cli.rs +++ b/openadr-client/src/bin/cli.rs @@ -5,10 +5,7 @@ use openadr_wire::program::ProgramContent; async fn main() -> Result<(), Box> { let client = openadr_client::Client::with_url( "http://localhost:3000/".try_into()?, - Some(ClientCredentials::new( - "admin".to_string(), - "admin".to_string(), - )), + Some(ClientCredentials::admin()), ); let _created_program = client.create_program(ProgramContent::new("name")).await?; // let created_program_1 = client.create_program(ProgramContent::new("name1")).await?; diff --git a/openadr-client/src/lib.rs b/openadr-client/src/lib.rs index 3b5239d..99c669b 100644 --- a/openadr-client/src/lib.rs +++ b/openadr-client/src/lib.rs @@ -77,6 +77,10 @@ impl ClientCredentials { default_credential_expires_in: Duration::from_secs(3600), } } + + pub fn admin() -> Self { + Self::new("admin".to_string(), "admin".to_string()) + } } struct AuthToken { diff --git a/openadr-client/tests/basic-read.rs b/openadr-client/tests/basic-read.rs index 227857c..c131650 100644 --- a/openadr-client/tests/basic-read.rs +++ b/openadr-client/tests/basic-read.rs @@ -10,25 +10,19 @@ mod helper { pub fn setup_mock_client() -> Client { use openadr_vtn::{data_source::InMemoryStorage, jwt::JwtManager, state::AppState}; + let auth_info = AuthInfo::bl_admin(); + let client_credentials = ClientCredentials::admin(); + let storage = InMemoryStorage::default(); - storage.auth.try_write().unwrap().push(AuthInfo { - client_id: "admin".into(), - client_secret: "admin".into(), - role: openadr_vtn::jwt::AuthRole::BL, - ven: None, - }); + storage.auth.try_write().unwrap().push(auth_info); let app_state = AppState::new(storage, JwtManager::from_secret(b"test")); - MockClientRef::new(app_state.into_router()) - .into_client(Some(ClientCredentials::new("admin".into(), "admin".into()))) + MockClientRef::new(app_state.into_router()).into_client(Some(client_credentials)) } pub fn setup_url_client(url: Url) -> Client { - Client::with_url( - url, - Some(ClientCredentials::new("admin".into(), "admin".into())), - ) + Client::with_url(url, Some(ClientCredentials::admin())) } pub fn setup_client() -> Client { diff --git a/openadr-vtn/src/api/event.rs b/openadr-vtn/src/api/event.rs index 6b4eb3b..6455dbe 100644 --- a/openadr-vtn/src/api/event.rs +++ b/openadr-vtn/src/api/event.rs @@ -216,12 +216,7 @@ mod test { fn state_with_events(events: Vec) -> AppState { let store = InMemoryStorage::default(); - store.auth.try_write().unwrap().push(AuthInfo { - client_id: "admin".to_string(), - client_secret: "admin".to_string(), - role: AuthRole::BL, - ven: None, - }); + store.auth.try_write().unwrap().push(AuthInfo::bl_admin()); { let mut writer = store.events.try_write().unwrap(); diff --git a/openadr-vtn/src/api/program.rs b/openadr-vtn/src/api/program.rs index 6ccd36b..a04af46 100644 --- a/openadr-vtn/src/api/program.rs +++ b/openadr-vtn/src/api/program.rs @@ -251,12 +251,7 @@ mod test { fn state_with_programs(programs: Vec) -> AppState { let store = InMemoryStorage::default(); - store.auth.try_write().unwrap().push(AuthInfo { - client_id: "admin".to_string(), - client_secret: "admin".to_string(), - role: AuthRole::BL, - ven: None, - }); + store.auth.try_write().unwrap().push(AuthInfo::bl_admin()); { let mut writer = store.programs.try_write().unwrap(); diff --git a/openadr-vtn/src/data_source/mod.rs b/openadr-vtn/src/data_source/mod.rs index fdbb794..c164f17 100644 --- a/openadr-vtn/src/data_source/mod.rs +++ b/openadr-vtn/src/data_source/mod.rs @@ -84,6 +84,17 @@ pub struct AuthInfo { pub ven: Option, } +impl AuthInfo { + pub fn bl_admin() -> Self { + Self { + client_id: "admin".to_string(), + client_secret: "admin".to_string(), + role: AuthRole::BL, + ven: None, + } + } +} + #[derive(Default, Clone)] pub struct InMemoryStorage { pub programs: Arc>>, diff --git a/openadr-vtn/src/main.rs b/openadr-vtn/src/main.rs index 5caa844..d6a016e 100644 --- a/openadr-vtn/src/main.rs +++ b/openadr-vtn/src/main.rs @@ -6,7 +6,7 @@ use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::{fmt, EnvFilter}; use openadr_vtn::data_source::{AuthInfo, InMemoryStorage}; -use openadr_vtn::jwt::{AuthRole, JwtManager}; +use openadr_vtn::jwt::JwtManager; use openadr_vtn::state::AppState; #[tokio::main] @@ -21,12 +21,7 @@ async fn main() { info!("listening on http://{}", listener.local_addr().unwrap()); let storage = InMemoryStorage::default(); - storage.auth.write().await.push(AuthInfo { - client_id: "admin".to_string(), - client_secret: "admin".to_string(), - role: AuthRole::BL, - ven: None, - }); + storage.auth.write().await.push(AuthInfo::bl_admin()); let state = AppState::new(storage, JwtManager::from_base64_secret("test").unwrap()); if let Err(e) = axum::serve(listener, state.into_router())