From 2c972d9b48761428dea160010c8e5d029af28617 Mon Sep 17 00:00:00 2001 From: FredApps Date: Thu, 19 Nov 2026 12:57:31 +0100 Subject: [PATCH] Consolidate zip integration tests --- crates/zip/tests/{ => it}/aligned_writer.rs | 0 crates/zip/tests/{ => it}/archive.rs | 0 .../lenient_zip64_end_record_compatibility.rs | 5 ++--- .../{ => it}/lenient_zip64_extra_boundaries.rs | 3 +-- .../tests/{ => it}/lenient_zip_decoded_size.rs | 3 +-- .../{ => it}/lenient_zip_directory_bounds.rs | 5 ++--- .../tests/{ => it}/lenient_zip_entry_detection.rs | 5 ++--- .../tests/{ => it}/lenient_zip_split_volumes.rs | 5 ++--- .../zip/tests/{ => it}/lenient_zip_stored_cap.rs | 3 +-- crates/zip/tests/it/main.rs | 15 +++++++++++++++ crates/zip/tests/{ => it}/public_api.rs | 0 11 files changed, 26 insertions(+), 18 deletions(-) rename crates/zip/tests/{ => it}/aligned_writer.rs (100%) rename crates/zip/tests/{ => it}/archive.rs (100%) rename crates/zip/tests/{ => it}/lenient_zip64_end_record_compatibility.rs (99%) rename crates/zip/tests/{ => it}/lenient_zip64_extra_boundaries.rs (98%) rename crates/zip/tests/{ => it}/lenient_zip_decoded_size.rs (97%) rename crates/zip/tests/{ => it}/lenient_zip_directory_bounds.rs (98%) rename crates/zip/tests/{ => it}/lenient_zip_entry_detection.rs (97%) rename crates/zip/tests/{ => it}/lenient_zip_split_volumes.rs (99%) rename crates/zip/tests/{ => it}/lenient_zip_stored_cap.rs (95%) create mode 100644 crates/zip/tests/it/main.rs rename crates/zip/tests/{ => it}/public_api.rs (100%) diff --git a/crates/zip/tests/aligned_writer.rs b/crates/zip/tests/it/aligned_writer.rs similarity index 100% rename from crates/zip/tests/aligned_writer.rs rename to crates/zip/tests/it/aligned_writer.rs diff --git a/crates/zip/tests/archive.rs b/crates/zip/tests/it/archive.rs similarity index 100% rename from crates/zip/tests/archive.rs rename to crates/zip/tests/it/archive.rs diff --git a/crates/zip/tests/lenient_zip64_end_record_compatibility.rs b/crates/zip/tests/it/lenient_zip64_end_record_compatibility.rs similarity index 99% rename from crates/zip/tests/lenient_zip64_end_record_compatibility.rs rename to crates/zip/tests/it/lenient_zip64_end_record_compatibility.rs index ed599fbda..334bd5ae5 100644 --- a/crates/zip/tests/lenient_zip64_end_record_compatibility.rs +++ b/crates/zip/tests/it/lenient_zip64_end_record_compatibility.rs @@ -1,9 +1,8 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip64_end_record_compatibility.rs. -use craft_zip::lenient::{self as zip, ZipArchive, ZipError}; -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use common::zip_stored; +use craft_zip::lenient::{self as zip, ZipArchive, ZipError}; fn warning_contains(archive: &ZipArchive, text: &str) -> bool { archive.warnings.iter().any(|warning| warning.contains(text)) diff --git a/crates/zip/tests/lenient_zip64_extra_boundaries.rs b/crates/zip/tests/it/lenient_zip64_extra_boundaries.rs similarity index 98% rename from crates/zip/tests/lenient_zip64_extra_boundaries.rs rename to crates/zip/tests/it/lenient_zip64_extra_boundaries.rs index fae4fd5f9..e7462a80d 100644 --- a/crates/zip/tests/lenient_zip64_extra_boundaries.rs +++ b/crates/zip/tests/it/lenient_zip64_extra_boundaries.rs @@ -1,8 +1,7 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip64_extra_boundaries.rs. -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use craft_zip::lenient as zip; fn archive(extra: &[u8], sentinel: usize) -> Vec { diff --git a/crates/zip/tests/lenient_zip_decoded_size.rs b/crates/zip/tests/it/lenient_zip_decoded_size.rs similarity index 97% rename from crates/zip/tests/lenient_zip_decoded_size.rs rename to crates/zip/tests/it/lenient_zip_decoded_size.rs index 9db3ec80e..edea7c8a7 100644 --- a/crates/zip/tests/lenient_zip_decoded_size.rs +++ b/crates/zip/tests/it/lenient_zip_decoded_size.rs @@ -1,8 +1,7 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip_decoded_size.rs. -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use craft_zip::lenient::{self as zip, ZipEntry, ZipError}; fn deflated(body: &[u8]) -> (Vec, ZipEntry) { diff --git a/crates/zip/tests/lenient_zip_directory_bounds.rs b/crates/zip/tests/it/lenient_zip_directory_bounds.rs similarity index 98% rename from crates/zip/tests/lenient_zip_directory_bounds.rs rename to crates/zip/tests/it/lenient_zip_directory_bounds.rs index 8e912fc3b..5831dc0e2 100644 --- a/crates/zip/tests/lenient_zip_directory_bounds.rs +++ b/crates/zip/tests/it/lenient_zip_directory_bounds.rs @@ -1,9 +1,8 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip_directory_bounds.rs. -use craft_zip::lenient::{self as zip, ZipError}; -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use common::zip_stored; +use craft_zip::lenient::{self as zip, ZipError}; #[test] fn a_short_declared_entry_is_rejected_before_its_signature_is_checked() { diff --git a/crates/zip/tests/lenient_zip_entry_detection.rs b/crates/zip/tests/it/lenient_zip_entry_detection.rs similarity index 97% rename from crates/zip/tests/lenient_zip_entry_detection.rs rename to crates/zip/tests/it/lenient_zip_entry_detection.rs index 8708b6400..34dd64157 100644 --- a/crates/zip/tests/lenient_zip_entry_detection.rs +++ b/crates/zip/tests/it/lenient_zip_entry_detection.rs @@ -1,9 +1,8 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip_entry_detection.rs. -use craft_zip::lenient::has_entry as zip_has_entry; -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use common::zip_stored; +use craft_zip::lenient::has_entry as zip_has_entry; /// A directory-shaped payload is ordinary file content, not an archive member. #[test] diff --git a/crates/zip/tests/lenient_zip_split_volumes.rs b/crates/zip/tests/it/lenient_zip_split_volumes.rs similarity index 99% rename from crates/zip/tests/lenient_zip_split_volumes.rs rename to crates/zip/tests/it/lenient_zip_split_volumes.rs index 9675177ce..9840cab45 100644 --- a/crates/zip/tests/lenient_zip_split_volumes.rs +++ b/crates/zip/tests/it/lenient_zip_split_volumes.rs @@ -1,9 +1,8 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip_split_volumes.rs. -use craft_zip::lenient::{self as zip, ZipError}; -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use common::zip_stored; +use craft_zip::lenient::{self as zip, ZipError}; fn assert_split(data: &[u8]) { assert!(matches!(zip::parse(data, 10), Err(ZipError::Unsupported(_)))); diff --git a/crates/zip/tests/lenient_zip_stored_cap.rs b/crates/zip/tests/it/lenient_zip_stored_cap.rs similarity index 95% rename from crates/zip/tests/lenient_zip_stored_cap.rs rename to crates/zip/tests/it/lenient_zip_stored_cap.rs index a5424605f..1a23dc09f 100644 --- a/crates/zip/tests/lenient_zip_stored_cap.rs +++ b/crates/zip/tests/it/lenient_zip_stored_cap.rs @@ -1,8 +1,7 @@ #![cfg(feature = "lenient")] // From Craft Anything crates/formats/tests/zip_stored_cap.rs. -#[path = "lenient_common/mod.rs"] -mod common; +use super::common; use craft_zip::lenient::{self as zip, ZipError}; #[test] diff --git a/crates/zip/tests/it/main.rs b/crates/zip/tests/it/main.rs new file mode 100644 index 000000000..476a770fd --- /dev/null +++ b/crates/zip/tests/it/main.rs @@ -0,0 +1,15 @@ +//! The crate's integration tests, linked into one test binary. + +#[path = "../lenient_common/mod.rs"] +mod common; + +mod aligned_writer; +mod archive; +mod lenient_zip64_end_record_compatibility; +mod lenient_zip64_extra_boundaries; +mod lenient_zip_decoded_size; +mod lenient_zip_directory_bounds; +mod lenient_zip_entry_detection; +mod lenient_zip_split_volumes; +mod lenient_zip_stored_cap; +mod public_api; diff --git a/crates/zip/tests/public_api.rs b/crates/zip/tests/it/public_api.rs similarity index 100% rename from crates/zip/tests/public_api.rs rename to crates/zip/tests/it/public_api.rs