refactor(scan) move test utils to test_utils.rs

crates/catalog/rest/Cargo.toml

@@ -47,6 +47,7 @@ uuid = { workspace = true, features = ["v4"] }
 [dev-dependencies]
 bytes = { workspace = true }
 futures = { workspace = true }
+iceberg = { workspace = true, features = ["test-utils"] }
 iceberg_test_utils = { path = "../../test_utils", features = ["tests"] }
 mockito = { workspace = true }
 # `stream` lets tests build a streaming body to exercise HttpRequestBody::Streaming.

crates/iceberg/Cargo.toml

@@ -31,6 +31,9 @@ repository = { workspace = true }
 
 [features]
 default = []
+# Exposes `iceberg::test_utils` for use by other crates' tests. Not public API;
+# enable it from `[dev-dependencies]` only.
+test-utils = ["dep:expect-test"]
 
 [dependencies]
 aes-gcm = { workspace = true }
@@ -54,7 +57,7 @@ bytes = { workspace = true }
 chrono = { workspace = true }
 crc32fast = { workspace = true }
 derive_builder = { workspace = true }
-expect-test = { workspace = true }
+expect-test = { workspace = true, optional = true }
 fastnum = { workspace = true }
 flate2 = { workspace = true }
 fnv = { workspace = true }

crates/iceberg/public-api.txt

@@ -3215,7 +3215,6 @@ pub fn iceberg::table::TableBuilder::readonly(self, readonly: bool) -> Self
 pub fn iceberg::table::TableBuilder::runtime(self, runtime: iceberg::Runtime) -> Self
 pub mod iceberg::test_utils
 pub fn iceberg::test_utils::check_record_batches(record_batches: alloc::vec::Vec<arrow_array::record_batch::RecordBatch>, expected_schema: expect_test::Expect, expected_data: expect_test::Expect, ignore_check_columns: &[&str], sort_column: core::option::Option<&str>)
-pub async fn iceberg::test_utils::make_encrypted_table() -> iceberg::table::Table
 pub fn iceberg::test_utils::test_runtime() -> iceberg::Runtime
 pub mod iceberg::transaction
 pub struct iceberg::transaction::ActionCommit

crates/iceberg/src/inspect/history.rs

@@ -126,9 +126,9 @@ mod tests {
 
     use crate::TableIdent;
     use crate::io::FileIO;
-    use crate::scan::tests::TableTestFixture;
     use crate::spec::TableMetadata;
     use crate::table::Table;
+    use crate::test_utils::scan::TableTestFixture;
     use crate::test_utils::{check_record_batches, test_runtime};
 
     fn table_from_metadata_json(metadata_json: &str) -> Table {

crates/iceberg/src/inspect/manifests.rs

@@ -289,9 +289,9 @@ mod tests {
     use expect_test::expect;
     use futures::TryStreamExt;
 
-    use crate::scan::tests::TableTestFixture;
     use crate::spec::TableMetadata;
     use crate::test_utils::check_record_batches;
+    use crate::test_utils::scan::TableTestFixture;
 
     #[tokio::test]
     async fn test_manifests_table() {

crates/iceberg/src/inspect/snapshots.rs

@@ -139,8 +139,8 @@ mod tests {
     use expect_test::expect;
     use futures::TryStreamExt;
 
-    use crate::scan::tests::TableTestFixture;
     use crate::test_utils::check_record_batches;
+    use crate::test_utils::scan::TableTestFixture;
 
     #[tokio::test]
     async fn test_snapshots_table() {

crates/iceberg/src/lib.rs

@@ -99,6 +99,7 @@ pub use runtime::{JoinHandle, Runtime, RuntimeHandle};
 pub mod arrow;
 pub(crate) mod delete_file_index;
 pub mod encryption;
+#[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;
 pub mod writer;