loose fixtures are usable more easily now

Byron · Byron · commit b86012bd5407 · 2022-10-12T11:10:17.000+08:00
diff --git a/git-index/tests/index/file/read.rs b/git-index/tests/index/file/read.rs
@@ -1,5 +1,6 @@
 use std::path::{Path, PathBuf};
 
+use crate::loose_file_path;
 use bstr::ByteSlice;
 use git_index::{entry, Version};
 use git_testtools::hex_to_id;
@@ -13,10 +14,6 @@ fn verify(index: git_index::File) -> git_index::File {
     index
 }
 
-pub(crate) fn loose_file_path(name: &str) -> PathBuf {
-    git_testtools::fixture_path(Path::new("loose_index").join(name).with_extension("git-index"))
-}
-
 pub(crate) fn loose_file(name: &str) -> git_index::File {
     let path = loose_file_path(name);
     let file = git_index::File::at(path, git_index::decode::Options::default()).unwrap();
diff --git a/git-index/tests/index/file/write.rs b/git-index/tests/index/file/write.rs
@@ -1,16 +1,12 @@
+use crate::index::Fixture::*;
 use filetime::FileTime;
 use git_index::{decode, entry, extension, verify::extensions::no_find, write, write::Options, State, Version};
 
-use crate::{fixture_index_path, index::file::read::loose_file_path};
+use crate::{fixture_index_path, loose_file_path};
 
 /// Round-trips should eventually be possible for all files we have, as we write them back exactly as they were read.
 #[test]
 fn roundtrips() -> crate::Result {
-    enum Kind {
-        Generated(&'static str),
-        Loose(&'static str),
-    }
-    use Kind::*;
     let input = [
         (Loose("extended-flags"), all_ext_but_eoie()),
         (Loose("conflicting-file"), all_ext_but_eoie()),
@@ -54,12 +50,6 @@ fn state_comparisons_with_various_extension_configurations() {
         }
     }
 
-    enum Kind {
-        Generated(&'static str),
-        Loose(&'static str),
-    }
-    use Kind::*;
-
     for fixture in [
         Loose("extended-flags"),
         Loose("conflicting-file"),
@@ -87,10 +77,8 @@ fn state_comparisons_with_various_extension_configurations() {
                 end_of_index_entry: true,
             }),
         ] {
-            let (path, fixture) = match fixture {
-                Generated(name) => (fixture_index_path(name), name),
-                Loose(name) => (loose_file_path(name), name),
-            };
+            let path = fixture.to_path();
+            let fixture = fixture.to_name();
             let expected = git_index::File::at(&path, Default::default()).unwrap();
 
             let mut out = Vec::<u8>::new();
diff --git a/git-index/tests/index/mod.rs b/git-index/tests/index/mod.rs
@@ -9,6 +9,10 @@ pub fn fixture_index_path(name: &str) -> PathBuf {
     dir.join(".git").join("index")
 }
 
+pub fn loose_file_path(name: &str) -> PathBuf {
+    git_testtools::fixture_path(Path::new("loose_index").join(name).with_extension("git-index"))
+}
+
 #[test]
 fn size_of_entry() {
     assert_eq!(std::mem::size_of::<git_index::Entry>(), 80);
@@ -17,3 +21,22 @@ fn size_of_entry() {
     assert_eq!(std::mem::size_of::<git_index::entry::Time>(), 8);
     assert_eq!(std::mem::size_of::<filetime::FileTime>(), 16);
 }
+
+enum Fixture {
+    Generated(&'static str),
+    Loose(&'static str),
+}
+
+impl Fixture {
+    pub fn to_path(&self) -> PathBuf {
+        match self {
+            Fixture::Generated(name) => fixture_index_path(name),
+            Fixture::Loose(name) => loose_file_path(name),
+        }
+    }
+    pub fn to_name(&self) -> &'static str {
+        match self {
+            Fixture::Generated(name) | Fixture::Loose(name) => name,
+        }
+    }
+}
