cleanup gix-ref-tests

Author: Byron

Cargo.lock

@@ -41,8 +41,6 @@ document-features = { version = "0.2.1", optional = true }
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
-gix-utils = { path = "../gix-utils" }
-tempfile = "3.2.0"
 
 
 [package.metadata.docs.rs]

gix-ref/Cargo.toml

@@ -3,7 +3,7 @@ use std::{convert::TryInto, path::Path};
 use gix_actor::Signature;
 use gix_date::{time::Sign, Time};
 use gix_object::bstr::ByteSlice;
-use tempfile::TempDir;
+use gix_testtools::tempfile::TempDir;
 
 use super::*;
 use crate::{file::WriteReflog, FullNameRef};

gix-ref/src/store/file/loose/reflog/create_or_update/tests.rs

@@ -4,44 +4,29 @@ version = "0.0.0"
 publish = false
 repository = "https://github.com/Byron/gitoxide"
 license = "MIT OR Apache-2.0"
-description = "Please use `gix-<thiscrate>` instead ('git' -> 'gix')"
+description = "Test the gix-ref crate with feature toggles"
 authors = ["Sebastian Thiel <[email protected]>"]
 edition = "2021"
-include = ["src/**/*"]
 rust-version = "1.65"
 
 [features]
-## Data structures implement `serde::Serialize` and `serde::Deserialize`.
-serde= ["gix-ref/serde"]
-internal-testing-gix-features-parallel = ["gix-features/parallel"] # test sorted parallel loose file traversal
+gix-features-parallel = ["gix-features/parallel"] # test sorted parallel loose file traversal
+serde = ["gix-ref/serde"]
 
 [[test]]
-name = "refs-single-threaded"
+name = "refs"
 path = "refs.rs"
-required-features = []
-
-[[test]]
-name = "refs-parallel-fs-traversal"
-path = "refs-parallel.rs"
-required-features = ["internal-testing-gix-features-parallel"]
 
 [dev-dependencies]
 gix-ref = { path = ".." }
 gix-fs = { path = "../../gix-fs" }
 gix-features = { path = "../../gix-features", features = ["walkdir"]}
 gix-testtools = { path = "../../tests/tools" }
 gix-discover = { path = "../../gix-discover" }
-gix-worktree = { path = "../../gix-worktree" }
 gix-odb = { path = "../../gix-odb" }
 gix-actor = { path = "../../gix-actor" }
 gix-date = { path = "../../gix-date" }
 gix-hash = { path = "../../gix-hash" }
 gix-validate = { path = "../../gix-validate" }
 gix-lock = { path = "../../gix-lock" }
 gix-object = { path = "../../gix-object" }
-tempfile = "3.2.0"
-
-
-[package.metadata.docs.rs]
-features = ["document-features", "serde"]
-rustdoc-args = ["--cfg", "docsrs"]

gix-ref/tests/Cargo.toml

@@ -92,7 +92,7 @@ mod iter {
         mod with_buffer_big_enough_for_largest_line {
             use gix_ref::log::Line;
 
-            use crate::util::hex_to_id;
+            use crate::hex_to_id;
 
             #[test]
             fn single_line() -> crate::Result {

gix-ref/tests/file/log.rs

@@ -50,7 +50,7 @@ mod peel {
     use gix_odb::pack::Find;
     use gix_ref::{file::ReferenceExt, peel, Reference};
 
-    use crate::{file, file::store_with_packed_refs, util::hex_to_id};
+    use crate::{file, file::store_with_packed_refs, hex_to_id};
 
     #[test]
     fn one_level() -> crate::Result {
@@ -182,7 +182,7 @@ mod parse {
         use gix_object::bstr::ByteSlice;
         use gix_ref::file::loose::Reference;
 
-        use crate::util::hex_to_id;
+        use crate::hex_to_id;
 
         macro_rules! mktest {
             ($name:ident, $input:literal, $kind:path, $id:expr, $ref:expr) => {

gix-ref/tests/file/reference.rs

@@ -3,7 +3,7 @@ mod existing {
 
     use gix_ref::{PartialName, PartialNameRef};
 
-    use crate::{file::store_at, util::hex_to_id};
+    use crate::{file::store_at, hex_to_id};
 
     #[test]
     fn with_packed_refs() -> crate::Result {
@@ -90,7 +90,7 @@ mod existing {
 }
 
 mod loose {
-    use crate::{file::store, util::hex_to_id};
+    use crate::{file::store, hex_to_id};
 
     mod existing {
         use std::path::Path;

gix-ref/tests/file/store/find.rs

@@ -4,7 +4,7 @@ use gix_object::bstr::ByteSlice;
 
 use crate::{
     file::{store, store_at, store_with_packed_refs},
-    util::hex_to_id,
+    hex_to_id,
 };
 
 mod with_namespace {

gix-ref/tests/file/store/iter.rs

@@ -10,7 +10,7 @@ pub(crate) mod prepare_and_commit {
         Target,
     };
 
-    use crate::util::hex_to_id;
+    use crate::hex_to_id;
 
     fn reflog_lines(store: &file::Store, name: &str) -> crate::Result<Vec<gix_ref::log::Line>> {
         let mut buf = Vec::new();
@@ -22,8 +22,8 @@ pub(crate) mod prepare_and_commit {
         Ok(res)
     }
 
-    pub(crate) fn empty_store() -> crate::Result<(tempfile::TempDir, file::Store)> {
-        let dir = tempfile::TempDir::new().unwrap();
+    pub(crate) fn empty_store() -> crate::Result<(gix_testtools::tempfile::TempDir, file::Store)> {
+        let dir = gix_testtools::tempfile::TempDir::new().unwrap();
         let store = file::Store::at(dir.path(), gix_ref::store::WriteReflog::Normal, gix_hash::Kind::Sha1);
         Ok((dir, store))
     }

gix-ref/tests/file/transaction/mod.rs

@@ -9,7 +9,7 @@ use gix_ref::{
 
 use crate::{
     file::transaction::prepare_and_commit::{committer, create_at, create_symbolic_at, delete_at, empty_store},
-    util::hex_to_id,
+    hex_to_id,
 };
 
 fn case_sensitive(tmp_dir: &std::path::Path) -> bool {