Extract test builders to crates_io_test_utils crate

Cargo.toml

@@ -152,6 +152,7 @@ crates_io_index = { path = "crates/crates_io_index", features = ["testing"] }
 crates_io_tarball = { path = "crates/crates_io_tarball", features = ["builder"] }
 crates_io_team_repo = { path = "crates/crates_io_team_repo", features = ["mock"] }
 crates_io_test_db = { path = "crates/crates_io_test_db" }
+crates_io_test_utils = { path = "crates/crates_io_test_utils" }
 crates_io_trustpub = { path = "crates/crates_io_trustpub", features = ["test-helpers"] }
 claims = "=0.8.0"
 diesel = { version = "=2.3.2", features = ["r2d2"] }

crates/crates_io_test_utils/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "crates_io_test_utils"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang/crates.io"
+description = "Test utilities for crates.io"
+edition = "2024"
+publish = false
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = "=1.0.100"
+bytes = "=1.10.1"
+cargo-manifest = "=0.19.1"
+chrono = "=0.4.42"
+crates_io_api_types = { path = "../crates_io_api_types" }
+crates_io_database = { path = "../crates_io_database" }
+crates_io_tarball = { path = "../crates_io_tarball", features = ["builder"] }
+diesel = "=2.3.2"
+diesel-async = "=0.7.3"
+semver = "=1.0.27"
+serde_json = "=1.0.145"
+toml = "=0.9.8"

src/tests/builders/dependency.rs → crates/crates_io_test_utils/src/builders/dependency.rs

@@ -1,4 +1,4 @@
-use crate::views::krate_publish as u;
+use crates_io_api_types::krate_publish;
 
 /// A builder for constructing a dependency of another crate.
 pub struct DependencyBuilder {
@@ -49,10 +49,10 @@ impl DependencyBuilder {
         self
     }
 
-    /// Consume this builder to create a `u::CrateDependency`. If the dependent crate doesn't
+    /// Consume this builder to create a `krate_publish::EncodableCrateDependency`. If the dependent crate doesn't
     /// already exist, publishing a crate with this dependency will fail.
-    pub fn build(self) -> u::EncodableCrateDependency {
-        u::EncodableCrateDependency {
+    pub fn build(self) -> krate_publish::EncodableCrateDependency {
+        krate_publish::EncodableCrateDependency {
             name: self.name,
             optional: false,
             default_features: true,

src/tests/builders/krate.rs → crates/crates_io_test_utils/src/builders/krate.rs

@@ -1,5 +1,5 @@
-use crate::models::{Category, Crate, Keyword, NewCrate, update_default_version};
-use crate::schema::{crate_downloads, crates, version_downloads};
+use crates_io_database::models::{Category, Crate, Keyword, NewCrate, update_default_version};
+use crates_io_database::schema::{crate_downloads, crates, version_downloads};
 
 use super::VersionBuilder;
 use chrono::{DateTime, Utc};

crates/crates_io_test_utils/src/builders/mod.rs

@@ -0,0 +1,9 @@
+mod dependency;
+mod krate;
+mod publish;
+mod version;
+
+pub use self::dependency::DependencyBuilder;
+pub use self::krate::CrateBuilder;
+pub use self::publish::PublishBuilder;
+pub use self::version::VersionBuilder;

src/tests/builders/publish.rs → crates/crates_io_test_utils/src/builders/publish.rs

@@ -1,7 +1,7 @@
-use crate::models::DependencyKind;
-use crate::views::krate_publish as u;
 use bytes::{BufMut, Bytes, BytesMut};
 use cargo_manifest::{DependencyDetail, DepsSet, MaybeInherited};
+use crates_io_api_types::krate_publish;
+use crates_io_database::models::DependencyKind;
 use std::collections::BTreeMap;
 
 use crates_io_tarball::TarballBuilder;
@@ -13,7 +13,7 @@ use super::DependencyBuilder;
 /// a crate into the database directly by using CrateBuilder will be faster.
 pub struct PublishBuilder {
     categories: Vec<String>,
-    deps: Vec<u::EncodableCrateDependency>,
+    deps: Vec<krate_publish::EncodableCrateDependency>,
     desc: Option<String>,
     doc_url: Option<String>,
     files: Vec<(String, Bytes)>,
@@ -139,7 +139,7 @@ impl PublishBuilder {
     }
 
     pub fn build(self) -> (String, Vec<u8>) {
-        let metadata = u::PublishMetadata {
+        let metadata = krate_publish::PublishMetadata {
             name: self.krate_name.clone(),
             vers: self.version.to_string(),
             readme: self.readme,
@@ -230,7 +230,7 @@ impl From<PublishBuilder> for Bytes {
 }
 
 fn convert_dependency(
-    encoded: &u::EncodableCrateDependency,
+    encoded: &krate_publish::EncodableCrateDependency,
 ) -> (String, cargo_manifest::Dependency) {
     let (name, package) = match encoded.explicit_name_in_toml.as_ref() {
         None => (encoded.name.to_string(), None),

src/tests/builders/version.rs → crates/crates_io_test_utils/src/builders/version.rs

@@ -1,9 +1,9 @@
-use crate::models::{Crate, NewVersion, Version};
-use crate::schema::dependencies;
+use crates_io_database::models::versions_published_by;
+use crates_io_database::models::{Crate, NewVersion, Version};
+use crates_io_database::schema::dependencies;
 use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
-use crates_io_database::models::versions_published_by;
 use diesel::prelude::*;
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
 

crates/crates_io_test_utils/src/lib.rs

@@ -0,0 +1 @@
+pub mod builders;

src/tests/mod.rs

@@ -15,7 +15,7 @@ use std::sync::LazyLock;
 mod account_lock;
 mod authentication;
 mod blocked_routes;
-pub mod builders;
+pub use crates_io_test_utils::builders;
 mod categories;
 mod cors;
 mod dump_db;