Cargo.toml

@@ -4,9 +4,7 @@ members = [
   "crates/cli",
   "crates/server",
   "crates/config",
-  "crates/config/test",
   "crates/git",
-  "crates/git/test",
   "crates/forge",
   "crates/forge-forgejo",
   "crates/forge-github",
@@ -26,9 +24,7 @@ expect_used = "warn"
 [workspace.dependencies]
 git-next-server = { path = "crates/server" }
 git-next-config = { path = "crates/config" }
-git-next-config-test = { path = "crates/config/test" }
 git-next-git = { path = "crates/git" }
-git-next-git-test = { path = "crates/git/test" }
 git-next-forge = { path = "crates/forge" }
 git-next-forge-forgejo = { path = "crates/forge-forgejo" }
 git-next-forge-github = { path = "crates/forge-github" }

crates/config/test/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "git-next-config-test"
-version = { workspace = true }
-edition = { workspace = true }
-
-[dependencies]
-git-next-config = { workspace = true }
-
-rand = { workspace = true }
-kxio = { workspace = true }
-
-[lints.clippy]
-nursery = { level = "warn", priority = -1 }
-# pedantic = "warn"
-unwrap_used = "warn"
-expect_used = "warn"

crates/config/test/src/given.rs

@@ -1,74 +0,0 @@
-//
-use config::{
-    server::Webhook, webhook::message::Body, BranchName, ForgeAlias, RepoAlias, RepoBranches,
-    WebhookAuth, WebhookId,
-};
-use git_next_config as config;
-
-use rand::RngCore;
-
-pub fn a_webhook_auth() -> WebhookAuth {
-    WebhookAuth::generate()
-}
-
-pub enum Header {
-    Valid(WebhookAuth, Body),
-    Missing,
-    Invalid,
-}
-
-pub fn a_webhook_message_body() -> Body {
-    Body::new(a_name())
-}
-
-pub fn repo_branches() -> RepoBranches {
-    RepoBranches::new(a_name(), a_name(), a_name())
-}
-
-pub fn a_forge_alias() -> ForgeAlias {
-    ForgeAlias::new(a_name())
-}
-
-pub fn a_repo_alias() -> RepoAlias {
-    RepoAlias::new(a_name())
-}
-
-pub fn a_network() -> kxio::network::MockNetwork {
-    kxio::network::MockNetwork::new()
-}
-
-pub fn a_webhook_url(
-    forge_alias: &ForgeAlias,
-    repo_alias: &RepoAlias,
-) -> git_next_config::server::WebhookUrl {
-    Webhook::new(a_name()).url(forge_alias, repo_alias)
-}
-
-pub fn any_webhook_url() -> git_next_config::server::WebhookUrl {
-    a_webhook_url(&a_forge_alias(), &a_repo_alias())
-}
-
-pub fn a_name() -> String {
-    use rand::Rng;
-    use std::iter;
-
-    fn generate(len: usize) -> String {
-        const CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        let mut rng = rand::thread_rng();
-        let one_char = || CHARSET[rng.gen_range(0..CHARSET.len())] as char;
-        iter::repeat_with(one_char).take(len).collect()
-    }
-    generate(5)
-}
-
-pub fn a_webhook_id() -> WebhookId {
-    WebhookId::new(a_name())
-}
-
-pub fn a_github_webhook_id() -> i64 {
-    rand::thread_rng().next_u32().into()
-}
-
-pub fn a_branch_name() -> BranchName {
-    BranchName::new(a_name())
-}

crates/config/test/src/lib.rs

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

crates/forge-forgejo/Cargo.toml

@@ -39,8 +39,6 @@ tokio = { workspace = true }
 
 [dev-dependencies]
 # Testing
-git-next-config-test = { workspace = true }
-git-next-git-test = { workspace = true }
 assert2 = { workspace = true }
 rand = { workspace = true }
 

crates/forge-forgejo/src/tests.rs

@@ -10,8 +10,8 @@ mod forgejo {
 
     use crate::ForgeJo;
     use config::{
-        webhook::message::Body, ForgeConfig, ForgeType, GitDir, ServerRepoConfig, WebhookAuth,
+        webhook::message::Body, ForgeAlias, ForgeConfig, ForgeType, GitDir, RepoAlias,
-        WebhookMessage,
+        RepoBranches, ServerRepoConfig, WebhookAuth, WebhookMessage,
     };
     use git::ForgeLike as _;
 
@@ -568,11 +568,9 @@ mod forgejo {
         }
     }
     mod given {
-        pub use git_next_config_test::given::*;
-        pub use git_next_git_test::given::*;
-
         use std::collections::HashMap;
 
+        use git_next_config::{server::Webhook, WebhookId};
         use kxio::network::{MockNetwork, StatusCode};
         use rand::RngCore;
         use serde_json::json;
@@ -606,6 +604,10 @@ mod forgejo {
             )
         }
 
+        pub fn a_webhook_auth() -> WebhookAuth {
+            WebhookAuth::generate()
+        }
+
         pub enum Header {
             Valid(WebhookAuth),
             Missing,
@@ -613,7 +615,6 @@ mod forgejo {
             NonUlid,
             WrongUlid,
         }
-
         pub fn a_webhook_message(header: Header) -> WebhookMessage {
             WebhookMessage::new(
                 given::a_forge_alias(),
@@ -622,7 +623,6 @@ mod forgejo {
                 given::a_webhook_message_body(),
             )
         }
-
         pub fn webhook_headers(header: Header) -> HashMap<String, String> {
             let mut headers = HashMap::new();
             match header {
@@ -645,6 +645,19 @@ mod forgejo {
             }
             headers
         }
+        pub fn a_webhook_message_body() -> Body {
+            Body::new(a_name())
+        }
+        pub fn a_commit() -> git::Commit {
+            git::Commit::new(
+                git::commit::Sha::new(a_name()),
+                git::commit::Message::new(a_name()),
+            )
+        }
+
+        pub fn repo_branches() -> RepoBranches {
+            RepoBranches::new(a_name(), a_name(), a_name())
+        }
 
         pub fn a_forgejo_forge(
             repo_details: &git::RepoDetails,
@@ -652,7 +665,6 @@ mod forgejo {
         ) -> ForgeJo {
             ForgeJo::new(repo_details.clone(), net.into())
         }
-
         pub fn repo_details() -> git::RepoDetails {
             git::RepoDetails::new(
                 git::Generation::new(),
@@ -677,6 +689,44 @@ mod forgejo {
             )
         }
 
+        pub fn a_forge_alias() -> ForgeAlias {
+            ForgeAlias::new(a_name())
+        }
+
+        pub fn a_repo_alias() -> RepoAlias {
+            RepoAlias::new(a_name())
+        }
+        pub fn a_network() -> kxio::network::MockNetwork {
+            kxio::network::MockNetwork::new()
+        }
+
+        pub fn a_webhook_url(
+            forge_alias: &ForgeAlias,
+            repo_alias: &RepoAlias,
+        ) -> git_next_config::server::WebhookUrl {
+            Webhook::new(a_name()).url(forge_alias, repo_alias)
+        }
+        pub fn any_webhook_url() -> git_next_config::server::WebhookUrl {
+            given::a_webhook_url(&given::a_forge_alias(), &given::a_repo_alias())
+        }
+
+        pub fn a_name() -> String {
+            use rand::Rng;
+            use std::iter;
+
+            fn generate(len: usize) -> String {
+                const CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+                let mut rng = rand::thread_rng();
+                let one_char = || CHARSET[rng.gen_range(0..CHARSET.len())] as char;
+                iter::repeat_with(one_char).take(len).collect()
+            }
+            generate(5)
+        }
+
+        pub fn a_webhook_id() -> WebhookId {
+            WebhookId::new(given::a_name())
+        }
+
         pub fn a_forgejo_webhook_id() -> i64 {
             rand::thread_rng().next_u32().into()
         }

crates/git/Cargo.toml

@@ -53,8 +53,6 @@ actix = { workspace = true }
 #
 [dev-dependencies]
 # Testing
-git-next-config-test = { workspace = true }
-git-next-git-test = { workspace = true }
 assert2 = { workspace = true }
 
 [lints.clippy]

crates/git/src/commit.rs

@@ -52,7 +52,6 @@ pub mod log {
     }
 
     impl From<String> for Error {
-        #[cfg(not(tarpaulin_include))]
         fn from(e: String) -> Self {
             Self::Gix(e)
         }

crates/git/src/file.rs

@@ -52,30 +52,26 @@ pub enum Error {
     TryId,
 }
 
-mod gix_errors {
+impl From<gix::reference::find::existing::Error> for Error {
-    #![cfg(not(tarpaulin_include))] // third-party library errors
-    use super::Error;
-    impl From<gix::reference::find::existing::Error> for Error {
     fn from(value: gix::reference::find::existing::Error) -> Self {
         Self::FindReference(value.to_string())
     }
-    }
+}
 
-    impl From<gix::object::commit::Error> for Error {
+impl From<gix::object::commit::Error> for Error {
     fn from(value: gix::object::commit::Error) -> Self {
         Self::NoTreeInCommit(value.to_string())
     }
-    }
+}
 
-    impl From<gix::object::find::existing::Error> for Error {
+impl From<gix::object::find::existing::Error> for Error {
     fn from(value: gix::object::find::existing::Error) -> Self {
         Self::FindObject(value.to_string())
     }
-    }
+}
 
-    impl From<std::string::FromUtf8Error> for Error {
+impl From<std::string::FromUtf8Error> for Error {
     fn from(value: std::string::FromUtf8Error) -> Self {
         Self::NonUtf8Blob(value.to_string())
     }
-    }
 }

crates/git/src/tests.rs

@@ -1,36 +1,22 @@
-use crate as git;
-
 mod commit {
-    use super::*;
+    use crate::{commit, Commit};
 
     #[test]
     fn should_return_sha() {
-        let sha = given::a_commit_sha();
+        let sha = commit::Sha::new("sha".to_string());
-        let commit = given::a_commit_with_sha(&sha);
+        let message = commit::Message::new("message".to_string());
+        let commit = Commit::new(sha.clone(), message);
 
         assert_eq!(commit.sha(), &sha);
     }
     #[test]
     fn should_return_message() {
-        let message = given::a_commit_message();
+        let sha = commit::Sha::new("sha".to_string());
-        let commit = given::a_commit_with_message(&message);
+        let message = commit::Message::new("message".to_string());
+        let commit = Commit::new(sha, message.clone());
 
         assert_eq!(commit.message(), &message);
     }
-    #[test]
-    fn should_convert_from_push() {
-        let sha = given::a_commit_sha();
-        let message = given::a_commit_message();
-        let push = given::a_webhook_push(&sha, &message);
-        let commit = git::Commit::from(push);
-
-        let expected = git::Commit::new(
-            git::commit::Sha::new(sha.to_string()),
-            git::commit::Message::new(message.to_string()),
-        );
-
-        assert_eq!(commit, expected);
-    }
 }
 mod generation {
     use crate::Generation;
@@ -174,19 +160,3 @@ mod repo_details {
         );
     }
 }
-mod branch {
-    use super::*;
-    use assert2::let_assert;
-    #[test]
-    fn reset_should_fetch_then_push() {
-        // let repository = given::a_mock_open_repository();
-        let repo_detauls = given::repo_details();
-        let_assert!(
-            Ok(result) = git::branch::reset(repository, repo_details, branch_name, git_ref, force)
-        );
-    }
-}
-mod given {
-    pub use git_next_config_test::given::*;
-    pub use git_next_git_test::given::*;
-}

crates/git/test/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "git-next-git-test"
-version = { workspace = true }
-edition = { workspace = true }
-
-[dependencies]
-git-next-git = { workspace = true }
-git-next-config = { workspace = true }
-git-next-config-test = { workspace = true }
-
-rand = { workspace = true }
-kxio = { workspace = true }
-# serde_json = { workspace = true }
-
-[lints.clippy]
-nursery = { level = "warn", priority = -1 }
-# pedantic = "warn"
-unwrap_used = "warn"
-expect_used = "warn"

crates/git/test/src/given.rs

@@ -1,45 +0,0 @@
-use git_next_config as config;
-use git_next_config_test::given::*;
-use git_next_git as git;
-
-pub fn a_commit() -> git::Commit {
-    git::Commit::new(a_commit_sha(), a_commit_message())
-}
-
-pub fn a_commit_with_message(message: &git::commit::Message) -> git::Commit {
-    git::Commit::new(a_commit_sha(), message.to_owned())
-}
-
-pub fn a_commit_with_sha(sha: &git::commit::Sha) -> git::Commit {
-    git::Commit::new(sha.to_owned(), a_commit_message())
-}
-
-pub fn a_commit_with(sha: &git::commit::Sha, message: &git::commit::Message) -> git::Commit {
-    git::Commit::new(sha.to_owned(), message.to_owned())
-}
-
-pub fn a_commit_message() -> git::commit::Message {
-    git::commit::Message::new(a_name())
-}
-
-pub fn a_commit_sha() -> git::commit::Sha {
-    git::commit::Sha::new(a_name())
-}
-
-pub fn a_webhook_push(
-    sha: &git::commit::Sha,
-    message: &git::commit::Message,
-) -> config::webhook::Push {
-    let branch = a_branch_name();
-    config::webhook::Push::new(branch, sha.to_string(), message.to_string())
-}
-
-pub fn repo_details() -> git::RepoDetails {
-    // generation: Generation,
-    // repo_alias: &RepoAlias,
-    // server_repo_config: &ServerRepoConfig,
-    // forge_alias: &ForgeAlias,
-    // forge_config: &ForgeConfig,
-    // gitdir: GitDir,
-    // git::RepoDetails::new()
-}

crates/git/test/src/lib.rs

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