diff --git a/satrs/src/pus/event_srv.rs b/satrs/src/pus/event_srv.rs index 282d645..a3378fa 100644 --- a/satrs/src/pus/event_srv.rs +++ b/satrs/src/pus/event_srv.rs @@ -199,7 +199,7 @@ mod tests { } impl PusTestHarness for Pus5HandlerWithStoreTester { - fn init_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { + fn start_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { let init_token = self .handler .service_helper @@ -249,7 +249,7 @@ mod tests { .write_to_be_bytes(&mut app_data) .expect("writing test event failed"); let ping_tc = PusTcCreator::new(sp_header, sec_header, &app_data, true); - let token = test_harness.init_verification(&ping_tc); + let token = test_harness.start_verification(&ping_tc); test_harness.send_tc(&token, &ping_tc); let request_id = token.request_id(); test_harness.handle_one_tc().unwrap(); @@ -310,7 +310,7 @@ mod tests { let sp_header = SpHeader::new_for_unseg_tc(TEST_APID, 0, 0); let sec_header = PusTcSecondaryHeader::new_simple(5, 200); let ping_tc = PusTcCreator::new_no_app_data(sp_header, sec_header, true); - let token = test_harness.init_verification(&ping_tc); + let token = test_harness.start_verification(&ping_tc); test_harness.send_tc(&token, &ping_tc); let result = test_harness.handle_one_tc(); assert!(result.is_ok()); @@ -330,7 +330,7 @@ mod tests { let sec_header = PusTcSecondaryHeader::new_simple(5, Subservice::TcEnableEventGeneration as u8); let ping_tc = PusTcCreator::new(sp_header, sec_header, &[0, 1, 2], true); - let token = test_harness.init_verification(&ping_tc); + let token = test_harness.start_verification(&ping_tc); test_harness.send_tc(&token, &ping_tc); let result = test_harness.handle_one_tc(); assert!(result.is_err()); diff --git a/satrs/src/pus/mod.rs b/satrs/src/pus/mod.rs index 4c5cff3..43d2629 100644 --- a/satrs/src/pus/mod.rs +++ b/satrs/src/pus/mod.rs @@ -1275,7 +1275,7 @@ pub mod test_util { UniqueApidTargetId::new(TEST_APID, TEST_UNIQUE_ID_1); pub trait PusTestHarness { - fn init_verification(&mut self, tc: &PusTcCreator) -> VerificationToken; + fn start_verification(&mut self, tc: &PusTcCreator) -> VerificationToken; fn send_tc(&self, token: &VerificationToken, tc: &PusTcCreator); fn read_next_tm(&mut self) -> PusTmReader<'_>; fn check_no_tm_available(&self) -> bool; diff --git a/satrs/src/pus/scheduler_srv.rs b/satrs/src/pus/scheduler_srv.rs index 46cfcb6..0b12394 100644 --- a/satrs/src/pus/scheduler_srv.rs +++ b/satrs/src/pus/scheduler_srv.rs @@ -309,7 +309,7 @@ mod tests { } impl PusTestHarness for Pus11HandlerWithStoreTester { - fn init_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { + fn start_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { let init_token = self .handler .service_helper @@ -387,7 +387,7 @@ mod tests { let reply_header = SpHeader::new_for_unseg_tm(TEST_APID, 0, 0); let tc_header = PusTcSecondaryHeader::new_simple(11, subservice as u8); let enable_scheduling = PusTcCreator::new(reply_header, tc_header, &[0; 7], true); - let token = test_harness.init_verification(&enable_scheduling); + let token = test_harness.start_verification(&enable_scheduling); test_harness.send_tc(&token, &enable_scheduling); let request_id = token.request_id(); @@ -449,7 +449,7 @@ mod tests { &sched_app_data[..written_len], true, ); - let token = test_harness.init_verification(&enable_scheduling); + let token = test_harness.start_verification(&enable_scheduling); test_harness.send_tc(&token, &enable_scheduling); let request_id = token.request_id(); diff --git a/satrs/src/pus/test.rs b/satrs/src/pus/test.rs index 0977662..c2ec5ff 100644 --- a/satrs/src/pus/test.rs +++ b/satrs/src/pus/test.rs @@ -180,7 +180,7 @@ mod tests { } impl PusTestHarness for Pus17HandlerWithStoreTester { - fn init_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { + fn start_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { let init_token = self .handler .service_helper @@ -242,7 +242,7 @@ mod tests { } impl PusTestHarness for Pus17HandlerWithVecTester { - fn init_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { + fn start_verification(&mut self, tc: &PusTcCreator) -> VerificationToken { let init_token = self .handler .service_helper @@ -287,7 +287,7 @@ mod tests { let sp_header = SpHeader::new_for_unseg_tc(TEST_APID, 0, 0); let sec_header = PusTcSecondaryHeader::new_simple(17, 1); let ping_tc = PusTcCreator::new_no_app_data(sp_header, sec_header, true); - let token = test_harness.init_verification(&ping_tc); + let token = test_harness.start_verification(&ping_tc); test_harness.send_tc(&token, &ping_tc); let request_id = token.request_id(); let result = test_harness.handle_one_tc(); @@ -342,7 +342,7 @@ mod tests { let sp_header = SpHeader::new_for_unseg_tc(TEST_APID, 0, 0); let sec_header = PusTcSecondaryHeader::new_simple(3, 1); let ping_tc = PusTcCreator::new_no_app_data(sp_header, sec_header, true); - let token = test_harness.init_verification(&ping_tc); + let token = test_harness.start_verification(&ping_tc); test_harness.send_tc(&token, &ping_tc); let result = test_harness.handle_one_tc(); assert!(result.is_err()); @@ -363,7 +363,7 @@ mod tests { let sp_header = SpHeader::new_for_unseg_tc(TEST_APID, 0, 0); let sec_header = PusTcSecondaryHeader::new_simple(17, 200); let ping_tc = PusTcCreator::new_no_app_data(sp_header, sec_header, true); - let token = test_harness.init_verification(&ping_tc); + let token = test_harness.start_verification(&ping_tc); test_harness.send_tc(&token, &ping_tc); let result = test_harness.handle_one_tc(); assert!(result.is_ok()); diff --git a/satrs/src/pus/verification.rs b/satrs/src/pus/verification.rs index c263feb..a6f8eb9 100644 --- a/satrs/src/pus/verification.rs +++ b/satrs/src/pus/verification.rs @@ -1830,7 +1830,7 @@ pub mod tests { } } - pub fn init_verification(&self) -> VerificationToken { + pub fn start_verification(&self) -> VerificationToken { let tc_reader = PusTcReader::new(&self.tc).unwrap(); self.reporter.start_verification(&tc_reader) } @@ -2090,7 +2090,7 @@ pub mod tests { #[test] fn test_basic_acceptance_success() { let testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let token = testbench.init_verification(); + let token = testbench.start_verification(); testbench .acceptance_success(token, &EMPTY_STAMP) .expect("sending acceptance success failed"); @@ -2100,7 +2100,7 @@ pub mod tests { #[test] fn test_basic_acceptance_failure() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let init_token = testbench.init_verification(); + let init_token = testbench.start_verification(); let timestamp = [1, 2, 3, 4, 5, 6, 7]; let fail_code = EcssEnumU16::new(2); let fail_params = FailParams::new_no_fail_data(timestamp.as_slice(), &fail_code); @@ -2113,7 +2113,7 @@ pub mod tests { #[test] fn test_basic_acceptance_failure_with_helper() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let init_token = testbench.init_verification(); + let init_token = testbench.start_verification(); let timestamp = [1, 2, 3, 4, 5, 6, 7]; let fail_code = EcssEnumU16::new(2); let fail_params = FailParams::new_no_fail_data(timestamp.as_slice(), &fail_code); @@ -2126,7 +2126,7 @@ pub mod tests { #[test] fn test_acceptance_fail_data_too_large() { let testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 8); - let init_token = testbench.init_verification(); + let init_token = testbench.start_verification(); let stamp_buf = [1, 2, 3, 4, 5, 6, 7]; let fail_code = EcssEnumU16::new(2); let fail_data: [u8; 16] = [0; 16]; @@ -2163,7 +2163,7 @@ pub mod tests { let mut fail_data_raw = [0; 4]; fail_data.write_to_be_bytes(&mut fail_data_raw).unwrap(); let fail_params = FailParams::new(&EMPTY_STAMP, &fail_code, fail_data_raw.as_slice()); - let init_token = testbench.init_verification(); + let init_token = testbench.start_verification(); testbench .acceptance_failure(init_token, fail_params) .expect("sending acceptance failure failed"); @@ -2181,7 +2181,7 @@ pub mod tests { #[test] fn test_start_failure() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let init_token = testbench.init_verification(); + let init_token = testbench.start_verification(); let fail_code = EcssEnumU8::new(22); let fail_data: i32 = -12; let mut fail_data_raw = [0; 4]; @@ -2200,7 +2200,7 @@ pub mod tests { #[test] fn test_start_failure_with_helper() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let fail_code = EcssEnumU8::new(22); let fail_data: i32 = -12; let mut fail_data_raw = [0; 4]; @@ -2219,7 +2219,7 @@ pub mod tests { #[test] fn test_steps_success() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let accepted_token = testbench .acceptance_success(token, &EMPTY_STAMP) .expect("acceptance failed"); @@ -2242,7 +2242,7 @@ pub mod tests { #[test] fn test_step_failure() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let fail_code = EcssEnumU32::new(0x1020); let fail_data: f32 = -22.3232; let mut fail_data_raw = [0; 4]; @@ -2276,7 +2276,7 @@ pub mod tests { #[test] fn test_completion_failure() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 16); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let fail_code = EcssEnumU32::new(0x1020); let fail_params = FailParams::new_no_fail_data(&EMPTY_STAMP, &fail_code); @@ -2299,7 +2299,7 @@ pub mod tests { fn test_complete_success_sequence() { let mut testbench = VerificationReporterTestbench::new(TEST_COMPONENT_ID_0.id(), create_generic_ping(), 16); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let accepted_token = testbench .acceptance_success(token, &EMPTY_STAMP) .expect("Sending acceptance success failed"); @@ -2321,7 +2321,7 @@ pub mod tests { create_generic_ping(), SequenceCounterHook::default(), ); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let accepted_token = testbench .acceptance_success(token, &EMPTY_STAMP) .expect("Sending acceptance success failed"); @@ -2339,7 +2339,7 @@ pub mod tests { #[test] fn test_completion_failure_helper_string_param() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 32); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let accepted_token = testbench .acceptance_success(token, &EMPTY_STAMP) .expect("Sending acceptance success failed"); @@ -2366,7 +2366,7 @@ pub mod tests { #[test] fn test_step_failure_helper_string_param() { let mut testbench = VerificationReporterTestbench::new(0, create_generic_ping(), 32); - let token = testbench.init_verification(); + let token = testbench.start_verification(); let accepted_token = testbench .acceptance_success(token, &EMPTY_STAMP) .expect("Sending acceptance success failed");