From 6cf0f164746293695a9c591f200df4f9480bf3c1 Mon Sep 17 00:00:00 2001 From: Yangosoft Date: Sat, 11 Jan 2025 01:42:19 +0100 Subject: [PATCH] Fixed tests --- src/coordinator.rs | 22 ++++++++++------------ src/subscriber.rs | 4 ++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/coordinator.rs b/src/coordinator.rs index 207d143..3bb5c68 100644 --- a/src/coordinator.rs +++ b/src/coordinator.rs @@ -372,10 +372,6 @@ impl Coordinator { Some(current_id - 1) } - pub fn get_num_participants(&self) -> u64 { - unsafe { (*self.directory).last_participant_id } - } - pub fn get_participant_id_by_event_id(&self, event_id: u64) -> Option { if event_id > MAX_EVENTS as u64 { return None; @@ -393,8 +389,8 @@ use std::ffi::CString; #[test] fn test_shared_memory_write_read() { - let mut coordinator = Coordinator::new("test_shared_memory_coordinator"); - let mut coordinator2 = Coordinator::open_existing("test_shared_memory_coordinator"); + let mut coordinator = Coordinator::new("test_shared_memory_write_read"); + let mut coordinator2 = Coordinator::open_existing("test_shared_memory_write_read"); let ret = coordinator.add_participant("test_participant"); assert!(ret.is_ok()); @@ -420,18 +416,20 @@ fn test_shared_memory_write_read() { #[test] fn test_events() { - let mut coordinator = Coordinator::new("test_shared_memory_coordinator"); - let mut coordinator2 = Coordinator::open_existing("test_shared_memory_coordinator"); - - let ret = coordinator.add_event("test_event"); + let mut coordinator = Coordinator::new("test_events"); + let mut coordinator2 = Coordinator::open_existing("test_events"); + let mut participant_id = coordinator + .add_participant("test_shared_memory_participant") + .unwrap(); + let ret = coordinator.add_event(participant_id, "test_event"); assert!(ret.is_ok()); let num_events = coordinator2.get_number_of_events(); assert_eq!(num_events, 1); - let ret = coordinator2.add_event("test_event"); + let ret = coordinator2.add_event(participant_id, "test_event"); assert!(ret.is_ok()); let num_events = coordinator2.get_number_of_events(); assert_eq!(num_events, 1); - let ret = coordinator2.add_event("test_event"); + let ret = coordinator2.add_event(participant_id, "test_event"); assert!(ret.is_ok()); let num_events = coordinator2.get_number_of_events(); assert_eq!(num_events, 1); diff --git a/src/subscriber.rs b/src/subscriber.rs index e5fe007..f5254c5 100644 --- a/src/subscriber.rs +++ b/src/subscriber.rs @@ -205,7 +205,7 @@ impl<'a> Subscriber<'a> { loop { debug!("Waiting on new participant..."); //Check which was the last event - let last_participant_id = self.coordinator.get_num_participants(); + let last_participant_id = self.coordinator.get_number_of_participants(); debug!( "Last participant id before waiting: {:?}", last_participant_id @@ -218,7 +218,7 @@ impl<'a> Subscriber<'a> { continue; } - let current_participant_id = self.coordinator.get_num_participants(); + let current_participant_id = self.coordinator.get_number_of_participants(); debug!( "New participant event received. Checking last participant id: {:?}", current_participant_id