From ccf1c11514020790bbd85b2c281a789f600648f4 Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Thu, 1 Feb 2024 15:14:16 +0000 Subject: [PATCH] Run clippy on tests as well. --- .github/workflows/build-test.yaml | 2 +- src/hash.rs | 3 +-- src/location.rs | 5 +---- src/metadata.rs | 12 ++++++------ src/metrics.rs | 2 +- src/utils.rs | 6 +++--- tests/test_api.rs | 19 ++++++++----------- 7 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 785c32a..97b84e6 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -25,7 +25,7 @@ jobs: with: toolchain: stable - name: Lint - run: cargo clippy -- -D warnings + run: cargo clippy --tests -- -D warnings - name: Format check run: cargo fmt --check - name: Build (debug) diff --git a/src/hash.rs b/src/hash.rs index 9f913fd..b57c549 100644 --- a/src/hash.rs +++ b/src/hash.rs @@ -158,7 +158,6 @@ pub fn validate_hash_file(path: &Path, expected: &str) -> Result<(), HashError> #[cfg(test)] mod tests { use super::*; - use tempfile; #[test] fn can_deparse_hash_algorithm() { @@ -274,7 +273,7 @@ mod tests { #[test] fn can_validate_hash() { let expect_md5 = "md5:81dc9bdb52d04dc20036dbd8313ed055"; - assert_eq!(validate_hash_data(b"1234", &expect_md5), Ok(())); + assert_eq!(validate_hash_data(b"1234", expect_md5), Ok(())); assert_eq!( validate_hash_data(b"12345", expect_md5), Err(HashError::new( diff --git a/src/location.rs b/src/location.rs index 1aa8523..51f71d3 100644 --- a/src/location.rs +++ b/src/location.rs @@ -118,10 +118,7 @@ mod tests { let entry_a = entries_a.first().unwrap(); let loc_b = root.join(".outpack/location/local"); let entries_b = read_location(loc_b.clone()).unwrap(); - assert!(entries_b - .iter() - .find(|e| e.packet == entry_a.packet) - .is_none()); + assert!(!entries_b.iter().any(|e| e.packet == entry_a.packet)); let now = SystemTime::now(); mark_packet_known( &entry_a.packet, diff --git a/src/metadata.rs b/src/metadata.rs index c14913d..387d502 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -297,7 +297,7 @@ mod tests { let all_packets = get_metadata_from_date(Path::new("tests/example"), None).unwrap(); assert_eq!(all_packets.len(), 4); let recent_packets = - get_metadata_from_date(Path::new("tests/example"), Some(1662480556 as f64)).unwrap(); + get_metadata_from_date(Path::new("tests/example"), Some(1662480556.)).unwrap(); assert_eq!(recent_packets.len(), 1); assert_eq!( recent_packets.first().unwrap().id, @@ -305,7 +305,7 @@ mod tests { ); let recent_packets = - get_metadata_from_date(Path::new("tests/example"), Some(1662480555 as f64)).unwrap(); + get_metadata_from_date(Path::new("tests/example"), Some(1662480555.)).unwrap(); assert_eq!(recent_packets.len(), 4); } @@ -370,7 +370,7 @@ mod tests { fn can_get_missing_ids() { let ids = get_missing_ids( Path::new("tests/example"), - &vec![ + &[ "20180818-164043-7cdcde4b".to_string(), "20170818-164830-33e0ab02".to_string(), ], @@ -383,7 +383,7 @@ mod tests { // check whitespace insensitivity let ids = get_missing_ids( Path::new("tests/example"), - &vec![ + &[ "20180818-164043-7cdcde4b".to_string(), "20170818-164830-33e0ab02".to_string(), ], @@ -398,7 +398,7 @@ mod tests { fn can_get_missing_unpacked_ids() { let ids = get_missing_ids( Path::new("tests/example"), - &vec![ + &[ "20170818-164847-7574883b".to_string(), "20170818-164830-33e0ab02".to_string(), ], @@ -413,7 +413,7 @@ mod tests { fn bad_ids_raise_error() { let res = get_missing_ids( Path::new("tests/example"), - &vec![ + &[ "20180818-164043-7cdcde4b".to_string(), "20170818-164830-33e0ab0".to_string(), ], diff --git a/src/metrics.rs b/src/metrics.rs index 747c193..eaf365e 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -115,7 +115,7 @@ mod tests { #[test] fn repository_collector_empty_repo() { let root = get_empty_outpack_root(); - let collector = RepositoryCollector::new(&root); + let collector = RepositoryCollector::new(root); assert_eq!(collector.metadata_total.get(), 0); assert_eq!(collector.packets_total.get(), 0); diff --git a/src/utils.rs b/src/utils.rs index 1afb615..9b7fcf3 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -28,9 +28,9 @@ mod tests { #[test] fn can_detect_packet_id() { - assert_eq!(is_packet(&OsString::from("1234")), false); - assert_eq!(is_packet(&OsString::from("20170818-164830-33e0ab01")), true); - assert_eq!(is_packet(&OsString::from("20180818-164847-54699abf")), true) + assert!(!is_packet(&OsString::from("1234"))); + assert!(is_packet(&OsString::from("20170818-164830-33e0ab01"))); + assert!(is_packet(&OsString::from("20180818-164847-54699abf"))) } #[test] diff --git a/tests/test_api.rs b/tests/test_api.rs index 7c7d3bc..b24e52a 100644 --- a/tests/test_api.rs +++ b/tests/test_api.rs @@ -7,7 +7,7 @@ use serde_json::Value; use sha2::{Digest, Sha256}; use std::fs; use std::fs::File; -use std::io::Read; + use std::path::{Path, PathBuf}; use std::sync::Arc; use tar::Archive; @@ -297,13 +297,10 @@ fn can_get_file() { let path = Path::new("tests/example/.outpack/files/sha256/b1/") .join("89579a9326f585d308304bd9e03326be5d395ac71b31df359ab8bac408d248"); - let mut file = fs::File::open(&path).unwrap(); - let metadata = fs::metadata(&path).unwrap(); - let mut buffer = vec![0; metadata.len() as usize]; - file.read(&mut buffer).unwrap(); + let expected = fs::read(path).unwrap(); - assert_eq!(response.into_bytes().unwrap(), buffer); + assert_eq!(response.into_bytes().unwrap(), expected); } #[test] @@ -514,7 +511,7 @@ fn file_post_handles_errors() { let client = Client::tracked(rocket).expect("valid rocket instance"); let content = "test"; let response = client - .post(format!("/file/md5:bad4a54")) + .post("/file/md5:bad4a54".to_string()) .body(content) .header(ContentType::Binary) .dispatch(); @@ -633,7 +630,7 @@ fn validate_error(instance: &Value, message: Option<&str>) { .expect("Status property present") .as_array() .unwrap() - .get(0) + .first() .expect("First error") .get("detail") .expect("Error detail") @@ -644,14 +641,14 @@ fn validate_error(instance: &Value, message: Option<&str>) { } fn assert_valid(instance: &Value, compiled: &JSONSchema) { - let result = compiled.validate(&instance); + let result = compiled.validate(instance); if let Err(errors) = result { for error in errors { println!("Validation error: {}", error); println!("Instance path: {}", error.instance_path); } } - assert!(compiled.is_valid(&instance)); + assert!(compiled.is_valid(instance)); } fn get_schema(schema_group: &str, schema_name: &str) -> JSONSchema { @@ -685,6 +682,6 @@ impl jsonschema::SchemaResolver for LocalSchemaResolver { .join(original_reference); let schema_as_string = fs::read_to_string(schema_path).expect("Schema file"); let json_schema = serde_json::from_str(&schema_as_string).expect("Schema is valid json"); - return Ok(Arc::new(json_schema)); + Ok(Arc::new(json_schema)) } }