From 7d695fc15b43e1f032d619f6aee370d45f7e2626 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 5 Feb 2023 17:48:07 +0100 Subject: [PATCH] some improvements for tests --- satrs-core/src/pus/scheduling.rs | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/satrs-core/src/pus/scheduling.rs b/satrs-core/src/pus/scheduling.rs index e97da72..a8ceeca 100644 --- a/satrs-core/src/pus/scheduling.rs +++ b/satrs-core/src/pus/scheduling.rs @@ -779,14 +779,13 @@ mod tests { let mut buf: [u8; 32] = [0; 32]; let tc = wrong_tc_service(UnixTimestamp::new_only_seconds(100), &mut buf); - match scheduler.insert_wrapped_tc::(&tc, &mut pool) { - Ok(_) => { - panic!(); - } - Err(e) => { - if e != ScheduleError::WrongService { - panic!(); - } + let err = scheduler.insert_wrapped_tc::(&tc, &mut pool); + assert!(err.is_err()); + let err = err.unwrap_err(); + match err { + ScheduleError::WrongService => {} + _ => { + panic!("unexpected error") } } } @@ -801,14 +800,13 @@ mod tests { let mut buf: [u8; 32] = [0; 32]; let tc = wrong_tc_subservice(UnixTimestamp::new_only_seconds(100), &mut buf); - match scheduler.insert_wrapped_tc::(&tc, &mut pool) { - Ok(_) => { - panic!(); - } - Err(e) => { - if e != ScheduleError::WrongSubservice { - panic!(); - } + let err = scheduler.insert_wrapped_tc::(&tc, &mut pool); + assert!(err.is_err()); + let err = err.unwrap_err(); + match err { + ScheduleError::WrongSubservice => {} + _ => { + panic!("unexpected error") } } }