test(http): [#159] add more tests for scrape request

josecelano · josecelano · commit c46e4171e5b0 · 2023-02-01T13:49:42.000Z
diff --git a/tests/common/fixtures.rs b/tests/common/fixtures.rs
@@ -27,6 +27,12 @@ impl PeerBuilder {
         self
     }
 
+    #[allow(dead_code)]
+    pub fn with_no_bytes_pending_to_download(mut self) -> Self {
+        self.peer.left = NumberOfBytes(0);
+        self
+    }
+
     #[allow(dead_code)]
     pub fn build(self) -> Peer {
         self.into()
diff --git a/tests/http/asserts.rs b/tests/http/asserts.rs
@@ -48,7 +48,7 @@ pub async fn assert_compact_announce_response(response: Response, expected_respo
 pub async fn assert_scrape_response(response: Response, expected_response: &scrape::Response) {
     assert_eq!(response.status(), 200);
 
-    let scrape_response = scrape::Response::try_from_bytes(&response.bytes().await.unwrap()).unwrap();
+    let scrape_response = scrape::Response::try_from_bencoded(&response.bytes().await.unwrap()).unwrap();
 
     assert_eq!(scrape_response, *expected_response);
 }
diff --git a/tests/http/requests/scrape.rs b/tests/http/requests/scrape.rs
@@ -54,6 +54,11 @@ impl QueryBuilder {
         self
     }
 
+    pub fn add_info_hash(mut self, info_hash: &InfoHash) -> Self {
+        self.scrape_query.info_hash.push(info_hash.0);
+        self
+    }
+
     pub fn query(self) -> Query {
         self.scrape_query
     }
@@ -82,6 +87,12 @@ pub struct QueryParams {
     pub info_hash: Vec<String>,
 }
 
+impl QueryParams {
+    pub fn set_one_info_hash_param(&mut self, info_hash: &str) {
+        self.info_hash = vec![info_hash.to_string()];
+    }
+}
+
 impl std::fmt::Display for QueryParams {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         let query = self
diff --git a/tests/http/responses/scrape.rs b/tests/http/responses/scrape.rs
@@ -12,23 +12,31 @@ pub struct Response {
 }
 
 impl Response {
-    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, BencodeParseError> {
-        let scrape_response: DeserializedResponse = serde_bencode::from_bytes(bytes).unwrap();
-        Self::try_from(scrape_response)
+    pub fn with_one_file(info_hash_bytes: ByteArray20, file: File) -> Self {
+        let mut files: HashMap<ByteArray20, File> = HashMap::new();
+        files.insert(info_hash_bytes, file);
+        Self { files }
     }
 
-    pub fn empty() -> Self {
-        Self::default()
+    pub fn try_from_bencoded(bytes: &[u8]) -> Result<Self, BencodeParseError> {
+        let scrape_response: DeserializedResponse = serde_bencode::from_bytes(bytes).unwrap();
+        Self::try_from(scrape_response)
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
 pub struct File {
     pub complete: i64,   // The number of active peers that have completed downloading
     pub downloaded: i64, // The number of peers that have ever completed downloading
     pub incomplete: i64, // The number of active peers that have not completed downloading
 }
 
+impl File {
+    pub fn zeroed() -> Self {
+        Self::default()
+    }
+}
+
 impl TryFrom<DeserializedResponse> for Response {
     type Error = BencodeParseError;
 
@@ -49,7 +57,7 @@ pub struct ResponseBuilder {
 impl ResponseBuilder {
     pub fn default() -> Self {
         Self {
-            response: Response::empty(),
+            response: Response::default(),
         }
     }
 
diff --git a/tests/http_tracker.rs b/tests/http_tracker.rs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ pub async fn assert_compact_announce_response(response: Response, expected_respo`
`48`	`48`	`pub async fn assert_scrape_response(response: Response, expected_response: &scrape::Response) {`
`49`	`49`	`assert_eq!(response.status(), 200);`
`50`	`50`
`51`		`- let scrape_response = scrape::Response::try_from_bytes(&response.bytes().await.unwrap()).unwrap();`
	`51`	`+ let scrape_response = scrape::Response::try_from_bencoded(&response.bytes().await.unwrap()).unwrap();`
`52`	`52`
`53`	`53`	`assert_eq!(scrape_response, *expected_response);`
`54`	`54`	`}`