add test fixture and adjust

Author: Sidney Douw

git-index/src/init.rs

@@ -67,9 +67,9 @@ impl EntryBuilder {
         let mode = match entry.mode {
             EntryMode::Tree => unreachable!("visit_non_tree() called us"),
             EntryMode::Blob => Mode::FILE,
-            EntryMode::BlobExecutable => todo!("executable"),
-            EntryMode::Link => todo!("symlink"),
-            EntryMode::Commit => todo!("submodule"),
+            EntryMode::BlobExecutable => Mode::FILE_EXECUTABLE,
+            EntryMode::Link => Mode::SYMLINK,
+            EntryMode::Commit => Mode::COMMIT,
         };
 
         let path_start = self.path_backing.len();

git-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b034a569959fd83c39e7aa870fea63b5fd8b87b5665e65881fade92592fc2c3
+size 11040

git-index/tests/fixtures/make_index/v2_all_file_kinds.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -eu -o pipefail
+
+export GIT_INDEX_VERSION=2;
+
+git init -q sub
+cd sub
+
+touch a b c
+git add .
+git commit -m "empty"
+
+cd ..
+
+git init -q
+git config index.threads 1
+
+touch a b
+chmod +x b
+ln -s a c
+mkdir d
+(cd d && touch a b c)
+
+git add .
+git commit -m "empty"

git-index/tests/index/file/write.rs

@@ -20,6 +20,7 @@ fn roundtrips() -> crate::Result {
         (Generated("v2"), Options::default()),
         (Generated("V2_empty"), Options::default()),
         (Generated("v2_more_files"), all_ext_but_eoie()),
+        (Generated("v2_all_file_kinds"), all_ext_but_eoie()),
     ];
 
     for (fixture, options) in input {
@@ -72,6 +73,7 @@ fn state_comparisons_with_various_extension_configurations() {
         Generated("V2_empty"),
         Generated("v2"),
         Generated("v2_more_files"),
+        Generated("v2_all_file_kinds"),
         Generated("v2_split_index"),
         Generated("v4_more_files_IEOT"),
     ] {

git-index/tests/index/init.rs

@@ -9,6 +9,7 @@ fn tree_to_state() -> crate::Result {
     let fixtures = [
         "make_index/v2.sh",
         "make_index/v2_more_files.sh",
+        "make_index/v2_all_file_kinds.sh",
         "make_index/v4_more_files_IEOT.sh",
     ];
 
@@ -33,28 +34,14 @@ fn compare_states(actual: &State, expected: &State, fixture: &str) {
     assert_eq!(
         actual.entries().len(),
         expected.entries().len(),
-        "entry count mismatch in {}",
+        "entry count mismatch in {:?}",
         fixture
     );
 
-    assert_eq!(
-        actual
-            .entries()
-            .iter()
-            .map(|e| (e.id, e.flags, e.mode))
-            .collect::<Vec<_>>(),
-        expected
-            .entries()
-            .iter()
-            .map(|e| (e.id, e.flags, e.mode))
-            .collect::<Vec<_>>()
-    );
-
-    // TODO: check if path_backing needs to be sorted like entries are
-    // assert_eq!(
-    //     actual.path_backing(),
-    //     expected.path_backing(),
-    //     "path_backing mismatch in {}",
-    //     fixture
-    // );
+    actual.entries().iter().zip(expected.entries()).for_each(|(a, e)| {
+        assert_eq!(a.id, e.id, "entry id mismatch in {:?}", fixture);
+        assert_eq!(a.flags, e.flags, "entry flags mismatch in {:?}", fixture);
+        assert_eq!(a.mode, e.mode, "entry mode mismatch in {:?}", fixture);
+        assert_eq!(a.path(actual), e.path(expected), "entry path mismatch in {:?}", fixture);
+    })
 }