Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor proposal for test asserts #172

Closed
wants to merge 1 commit into from
Closed

Refactor proposal for test asserts #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions tests/http_tracker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mod http_tracker_server {
use std::str::FromStr;

use local_ip_address::local_ip;
use reqwest::Response;
use reqwest::{Response, StatusCode};
use torrust_tracker::protocol::info_hash::InfoHash;
use torrust_tracker::tracker::peer;

Expand Down Expand Up @@ -321,6 +321,23 @@ mod http_tracker_server {
.await;
}

/// A wrapper for the HTTP response with only the relevant attributes for the test
#[derive(Debug, PartialEq)]
struct HttpAnnounceResponse {
status: reqwest::StatusCode,
announce: Announce,
}

impl HttpAnnounceResponse {
pub async fn from(response: Response) -> Self {
let status = response.status();
let body = response.text().await.unwrap();
let announce: Announce = serde_bencode::from_str(&body)
.unwrap_or_else(|_| panic!("response body should be a valid announce response, got \"{}\"", &body));
Self { status, announce }
}
}

#[tokio::test]
async fn should_return_the_list_of_previously_announced_peers() {
let http_tracker_server = start_public_http_tracker().await;
Expand All @@ -345,18 +362,20 @@ mod http_tracker_server {
)
.await;

// It should only contain teh previously announced peer
assert_announce_response(
response,
&Announce {
complete: 2,
incomplete: 0,
interval: http_tracker_server.tracker.config.announce_interval,
min_interval: http_tracker_server.tracker.config.min_announce_interval,
peers: vec![DictionaryPeer::from(previously_announced_peer)],
},
)
.await;
// It should only contain the previously announced peer
assert_eq!(
HttpAnnounceResponse::from(response).await,
HttpAnnounceResponse {
status: StatusCode::OK,
announce: Announce {
complete: 2,
incomplete: 0,
interval: http_tracker_server.tracker.config.announce_interval,
min_interval: http_tracker_server.tracker.config.min_announce_interval,
peers: vec![DictionaryPeer::from(previously_announced_peer)],
}
}
);
}

#[tokio::test]
Expand Down