Skip to content

Commit a2b16ff

Browse files
committed
fix: tests using mock for old service
I only change test to use the new mock. I realized test were wrong becuase they do not fail when no event is sent. THey only fail when the event sent is not the rigth type.
1 parent daec1fe commit a2b16ff

File tree

1 file changed

+20
-36
lines changed

1 file changed

+20
-36
lines changed

src/udp/handlers.rs

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -345,29 +345,13 @@ mod tests {
345345

346346
struct TrackerStatsServiceMock {
347347
stats: Arc<RwLock<TrackerStatistics>>,
348-
expected_event: Option<TrackerStatisticsEvent>,
349348
}
350349

351350
impl TrackerStatsServiceMock {
352351
fn new() -> Self {
353352
Self {
354353
stats: Arc::new(RwLock::new(TrackerStatistics::new())),
355-
expected_event: None,
356-
}
357-
}
358-
359-
fn should_throw_event(&mut self, expected_event: TrackerStatisticsEvent) {
360-
self.expected_event = Some(expected_event);
361-
}
362-
}
363-
364-
#[async_trait]
365-
impl TrackerStatisticsEventSender for TrackerStatsServiceMock {
366-
async fn send_event(&self, _event: TrackerStatisticsEvent) -> Option<Result<(), SendError<TrackerStatisticsEvent>>> {
367-
if self.expected_event.is_some() {
368-
assert_eq!(_event, *self.expected_event.as_ref().unwrap());
369354
}
370-
None
371355
}
372356
}
373357

@@ -387,9 +371,9 @@ mod tests {
387371

388372
#[async_trait]
389373
impl TrackerStatisticsEventSender for StatsEventSenderMock {
390-
async fn send_event(&self, _event: TrackerStatisticsEvent) -> Option<Result<(), SendError<TrackerStatisticsEvent>>> {
374+
async fn send_event(&self, event: TrackerStatisticsEvent) -> Option<Result<(), SendError<TrackerStatisticsEvent>>> {
391375
if self.expected_event.is_some() {
392-
assert_eq!(_event, *self.expected_event.as_ref().unwrap());
376+
assert_eq!(event, *self.expected_event.as_ref().unwrap());
393377
}
394378
None
395379
}
@@ -493,11 +477,11 @@ mod tests {
493477

494478
#[tokio::test]
495479
async fn it_should_send_the_upd4_connect_event_when_a_client_tries_to_connect_using_a_ip4_socket_address() {
496-
let mut tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
497-
let stats_event_sender = Box::new(StatsEventSenderMock::new());
480+
let tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
481+
let mut stats_event_sender = Box::new(StatsEventSenderMock::new());
498482

499483
let client_socket_address = sample_ipv4_socket_address();
500-
tracker_stats_service.should_throw_event(TrackerStatisticsEvent::Udp4Connect);
484+
stats_event_sender.should_throw_event(TrackerStatisticsEvent::Udp4Connect);
501485

502486
let torrent_tracker =
503487
Arc::new(TorrentTracker::new(default_tracker_config(), tracker_stats_service, Some(stats_event_sender)).unwrap());
@@ -508,10 +492,10 @@ mod tests {
508492

509493
#[tokio::test]
510494
async fn it_should_send_the_upd6_connect_event_when_a_client_tries_to_connect_using_a_ip6_socket_address() {
511-
let mut tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
512-
let stats_event_sender = Box::new(StatsEventSenderMock::new());
495+
let tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
496+
let mut stats_event_sender = Box::new(StatsEventSenderMock::new());
513497

514-
tracker_stats_service.should_throw_event(TrackerStatisticsEvent::Udp6Connect);
498+
stats_event_sender.should_throw_event(TrackerStatisticsEvent::Udp6Connect);
515499

516500
let torrent_tracker =
517501
Arc::new(TorrentTracker::new(default_tracker_config(), tracker_stats_service, Some(stats_event_sender)).unwrap());
@@ -748,10 +732,10 @@ mod tests {
748732

749733
#[tokio::test]
750734
async fn should_send_the_upd4_announce_event() {
751-
let mut tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
752-
let stats_event_sender = Box::new(StatsEventSenderMock::new());
735+
let tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
736+
let mut stats_event_sender = Box::new(StatsEventSenderMock::new());
753737

754-
tracker_stats_service.should_throw_event(TrackerStatisticsEvent::Udp4Announce);
738+
stats_event_sender.should_throw_event(TrackerStatisticsEvent::Udp4Announce);
755739

756740
let tracker = Arc::new(
757741
TorrentTracker::new(default_tracker_config(), tracker_stats_service, Some(stats_event_sender)).unwrap(),
@@ -975,10 +959,10 @@ mod tests {
975959

976960
#[tokio::test]
977961
async fn should_send_the_upd6_announce_event() {
978-
let mut tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
979-
let stats_event_sender = Box::new(StatsEventSenderMock::new());
962+
let tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
963+
let mut stats_event_sender = Box::new(StatsEventSenderMock::new());
980964

981-
tracker_stats_service.should_throw_event(TrackerStatisticsEvent::Udp6Announce);
965+
stats_event_sender.should_throw_event(TrackerStatisticsEvent::Udp6Announce);
982966

983967
let tracker = Arc::new(
984968
TorrentTracker::new(default_tracker_config(), tracker_stats_service, Some(stats_event_sender)).unwrap(),
@@ -1287,10 +1271,10 @@ mod tests {
12871271

12881272
#[tokio::test]
12891273
async fn should_send_the_upd4_scrape_event() {
1290-
let mut tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
1291-
let stats_event_sender = Box::new(StatsEventSenderMock::new());
1274+
let tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
1275+
let mut stats_event_sender = Box::new(StatsEventSenderMock::new());
12921276

1293-
tracker_stats_service.should_throw_event(TrackerStatisticsEvent::Udp4Scrape);
1277+
stats_event_sender.should_throw_event(TrackerStatisticsEvent::Udp4Scrape);
12941278

12951279
let remote_addr = sample_ipv4_remote_addr();
12961280
let tracker = Arc::new(
@@ -1316,10 +1300,10 @@ mod tests {
13161300

13171301
#[tokio::test]
13181302
async fn should_send_the_upd6_scrape_event() {
1319-
let mut tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
1320-
let stats_event_sender = Box::new(StatsEventSenderMock::new());
1303+
let tracker_stats_service = Box::new(TrackerStatsServiceMock::new());
1304+
let mut stats_event_sender = Box::new(StatsEventSenderMock::new());
13211305

1322-
tracker_stats_service.should_throw_event(TrackerStatisticsEvent::Udp6Scrape);
1306+
stats_event_sender.should_throw_event(TrackerStatisticsEvent::Udp6Scrape);
13231307

13241308
let remote_addr = sample_ipv6_remote_addr();
13251309
let tracker = Arc::new(

0 commit comments

Comments
 (0)