Skip to content

Commit 0659553

Browse files
committed
[eclipse-iceoryx#674] Test publishing of removed services
1 parent 7e38a3f commit 0659553

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

iceoryx2-services/discovery/tests/service_monitor_tests.rs

+16-14
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ mod service_monitor {
2929
}
3030

3131
#[test]
32-
fn publishes_added_services_when_configured() {
33-
const NUMBER_OF_SERVICES_ADDED: usize = 3;
32+
fn publishes_added_and_removed_services_when_configured() {
33+
const NUMBER_OF_SERVICES_ADDED: usize = 5;
34+
const NUMBER_OF_SERVICES_REMOVED: usize = 3;
3435

3536
let iceoryx_config = generate_isolated_config();
3637
let node = NodeBuilder::new()
@@ -48,7 +49,6 @@ mod service_monitor {
4849
send_notifications: false,
4950
};
5051
let mut sut = Monitor::<ipc::Service>::new(&monitor_config, &iceoryx_config);
51-
sut.spin();
5252

5353
// subscribe to the monitoring service
5454
let service_name = ServiceName::new(service_name_string.as_str()).unwrap();
@@ -70,29 +70,31 @@ mod service_monitor {
7070
.unwrap();
7171
services.push(service);
7272
}
73+
sut.spin();
7374

74-
// verify the added services are published on next monitor iteration
75+
// remove some services
76+
for _ in 0..NUMBER_OF_SERVICES_REMOVED {
77+
services.pop();
78+
}
7579
sut.spin();
7680

77-
let mut num_received = 0;
81+
let mut num_added = 0;
82+
let mut num_removed = 0;
7883
while let Ok(Some(event)) = subscriber.receive() {
7984
match event.payload() {
80-
DiscoveryEvent::Added(service) => {
81-
println!("added {:?}", service.name())
85+
DiscoveryEvent::Added(_) => {
86+
num_added += 1;
8287
}
83-
DiscoveryEvent::Removed(service) => {
84-
println!("removed {}", service.name())
88+
DiscoveryEvent::Removed(_) => {
89+
num_removed += 1;
8590
}
8691
}
87-
num_received += 1;
8892
}
8993

90-
assert_that!(num_received, eq NUMBER_OF_SERVICES_ADDED);
94+
assert_that!(num_added, eq NUMBER_OF_SERVICES_ADDED);
95+
assert_that!(num_removed, eq NUMBER_OF_SERVICES_REMOVED);
9196
}
9297

93-
#[test]
94-
fn publishes_removed_services_when_configured() {}
95-
9698
#[test]
9799
fn sends_notifications_when_configured() {}
98100

0 commit comments

Comments
 (0)