object/tree: Fix tests

3 files changed, 35 insertions, 55 deletions

diff --git a/object/tree/helpers_test.go b/object/tree/helpers_test.go
index d6cfddb6..3e5eddd4 100644
--- a/object/tree/helpers_test.go
+++ b/object/tree/helpers_test.go
@@ -43,26 +43,26 @@ func mixedEntries(tb testing.TB, repo *testgit.Repo) []tree.Entry {
 	}
 
 	return []tree.Entry{
-		{Mode: mode.Regular, Name: "z", ID: blobA},
-		{Mode: mode.Regular, Name: "A", ID: blobB},
-		{Mode: mode.Regular, Name: "aa", ID: blobC},
-		{Mode: mode.Regular, Name: "a0", ID: blobA},
-		{Mode: mode.Regular, Name: "a.", ID: blobC},
-		{Mode: mode.Regular, Name: "Z", ID: blobB},
-		{Mode: mode.Regular, Name: "0", ID: blobA},
-		{Mode: mode.Regular, Name: "CAPS", ID: blobB},
-		{Mode: mode.Regular, Name: "caps", ID: blobC},
-		{Mode: mode.Regular, Name: "name with space", ID: blobB},
-		{Mode: mode.Regular, Name: "name.with.dot", ID: blobA},
-		{Mode: mode.Regular, Name: "这是一些非 ASCII 的字符", ID: blobC},
-		{Mode: mode.Regular, Name: "Emoji 👀", ID: blobC},
-		{Mode: mode.Regular, Name: ".hidden", ID: blobA},
-		{Mode: mode.Executable, Name: "exec.sh", ID: blobB},
-		{Mode: mode.Symlink, Name: "sym.link", ID: blobC},
-		{Mode: mode.Gitlink, Name: "submodule", ID: submodule},
-		{Mode: mode.Regular, Name: "dir-", ID: blobA},
-		{Mode: mode.Directory, Name: "dir", ID: subTree},
-		{Mode: mode.Regular, Name: "dir0", ID: blobB},
+		{Mode: mode.Regular, Name: []byte("z"), ID: blobA},
+		{Mode: mode.Regular, Name: []byte("A"), ID: blobB},
+		{Mode: mode.Regular, Name: []byte("aa"), ID: blobC},
+		{Mode: mode.Regular, Name: []byte("a0"), ID: blobA},
+		{Mode: mode.Regular, Name: []byte("a."), ID: blobC},
+		{Mode: mode.Regular, Name: []byte("Z"), ID: blobB},
+		{Mode: mode.Regular, Name: []byte("0"), ID: blobA},
+		{Mode: mode.Regular, Name: []byte("CAPS"), ID: blobB},
+		{Mode: mode.Regular, Name: []byte("caps"), ID: blobC},
+		{Mode: mode.Regular, Name: []byte("name with space"), ID: blobB},
+		{Mode: mode.Regular, Name: []byte("name.with.dot"), ID: blobA},
+		{Mode: mode.Regular, Name: []byte("这是一些非 ASCII 的字符"), ID: blobC},
+		{Mode: mode.Regular, Name: []byte("Emoji 👀"), ID: blobC},
+		{Mode: mode.Regular, Name: []byte(".hidden"), ID: blobA},
+		{Mode: mode.Executable, Name: []byte("exec.sh"), ID: blobB},
+		{Mode: mode.Symlink, Name: []byte("sym.link"), ID: blobC},
+		{Mode: mode.Gitlink, Name: []byte("submodule"), ID: submodule},
+		{Mode: mode.Regular, Name: []byte("dir-"), ID: blobA},
+		{Mode: mode.Directory, Name: []byte("dir"), ID: subTree},
+		{Mode: mode.Regular, Name: []byte("dir0"), ID: blobB},
 	}
 }
 
@@ -73,7 +73,7 @@ func mkTreeEntries(entries []tree.Entry) []testgit.TreeEntry {
 			Mode: strconv.FormatUint(uint64(entry.Mode), 8),
 			Type: entry.Mode.ObjectType(),
 			OID:  entry.ID,
-			Name: entry.Name,
+			Name: string(entry.Name),
 		}
 	}
 
@@ -124,7 +124,7 @@ func assertGitDecode(tb testing.TB, repo *testgit.Repo, treeID id.ObjectID, got
 			tb.Fatalf("entry[%d] id = %s, want %s", i, got[i].ID, want[i].OID)
 		}
 
-		if got[i].Name != want[i].Name {
+		if string(got[i].Name) != want[i].Name {
 			tb.Fatalf("entry[%d] name = %q, want %q", i, got[i].Name, want[i].Name)
 		}
 	}
diff --git a/object/tree/insert_test.go b/object/tree/insert_test.go
index fbf65b84..1dd406d5 100644
--- a/object/tree/insert_test.go
+++ b/object/tree/insert_test.go
@@ -18,10 +18,10 @@ func TestInsertRejects(t *testing.T) {
 		name  string
 		entry tree.Entry
 	}{
-		{name: "empty-name", entry: tree.Entry{Mode: mode.Regular, Name: "", ID: zero}},
-		{name: "slash-name", entry: tree.Entry{Mode: mode.Regular, Name: "a/b", ID: zero}},
-		{name: "nul-name", entry: tree.Entry{Mode: mode.Regular, Name: "a\x00b", ID: zero}},
-		{name: "invalid-mode", entry: tree.Entry{Mode: mode.Mode(0o100640), Name: "file", ID: zero}},
+		{name: "empty-name", entry: tree.Entry{Mode: mode.Regular, Name: []byte(""), ID: zero}},
+		{name: "slash-name", entry: tree.Entry{Mode: mode.Regular, Name: []byte("a/b"), ID: zero}},
+		{name: "nul-name", entry: tree.Entry{Mode: mode.Regular, Name: []byte("a\x00b"), ID: zero}},
+		{name: "invalid-mode", entry: tree.Entry{Mode: mode.Mode(0o100640), Name: []byte("file"), ID: zero}},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
@@ -48,18 +48,18 @@ func TestInsertRejectsConflict(t *testing.T) {
 	}{
 		{
 			name:   "same-mode",
-			first:  tree.Entry{Mode: mode.Regular, Name: "file", ID: zero},
-			second: tree.Entry{Mode: mode.Regular, Name: "file", ID: zero},
+			first:  tree.Entry{Mode: mode.Regular, Name: []byte("file"), ID: zero},
+			second: tree.Entry{Mode: mode.Regular, Name: []byte("file"), ID: zero},
 		},
 		{
 			name:   "blob-then-tree",
-			first:  tree.Entry{Mode: mode.Regular, Name: "name", ID: zero},
-			second: tree.Entry{Mode: mode.Directory, Name: "name", ID: zero},
+			first:  tree.Entry{Mode: mode.Regular, Name: []byte("name"), ID: zero},
+			second: tree.Entry{Mode: mode.Directory, Name: []byte("name"), ID: zero},
 		},
 		{
 			name:   "tree-then-blob",
-			first:  tree.Entry{Mode: mode.Directory, Name: "name", ID: zero},
-			second: tree.Entry{Mode: mode.Regular, Name: "name", ID: zero},
+			first:  tree.Entry{Mode: mode.Directory, Name: []byte("name"), ID: zero},
+			second: tree.Entry{Mode: mode.Regular, Name: []byte("name"), ID: zero},
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
@@ -79,24 +79,3 @@ func TestInsertRejectsConflict(t *testing.T) {
 		})
 	}
 }
-
-func TestEntriesIsCopy(t *testing.T) {
-	t.Parallel()
-
-	zero := id.SupportedObjectFormats()[0].Zero()
-
-	var tr tree.Tree
-
-	err := tr.Insert(tree.Entry{Mode: mode.Regular, Name: "file", ID: zero})
-	if err != nil {
-		t.Fatalf("Insert: %v", err)
-	}
-
-	entries := tr.Entries()
-	entries[0].Name = "mutated"
-
-	again := tr.Entries()
-	if again[0].Name != "file" {
-		t.Fatalf("Entries()[0].Name = %q, want %q", again[0].Name, "file")
-	}
-}
diff --git a/object/tree/lookup_test.go b/object/tree/lookup_test.go
index 22d73615..706c1cd2 100644
--- a/object/tree/lookup_test.go
+++ b/object/tree/lookup_test.go
@@ -1,6 +1,7 @@
 package tree_test
 
 import (
+	"bytes"
 	"testing"
 
 	"lindenii.org/go/furgit/internal/testgit"
@@ -28,12 +29,12 @@ func TestFind(t *testing.T) {
 					t.Fatalf("Find(%q) not found", want.Name)
 				}
 
-				if got.Mode != want.Mode || got.Name != want.Name || got.ID != want.ID {
+				if got.Mode != want.Mode || !bytes.Equal(got.Name, want.Name) || got.ID != want.ID {
 					t.Fatalf("Find(%q) = %+v, want %+v", want.Name, got, want)
 				}
 			}
 
-			if _, ok := tr.Find("does-not-exist"); ok {
+			if _, ok := tr.Find([]byte("does-not-exist")); ok {
 				t.Fatalf("Find(does-not-exist) = true, want false")
 			}
 		})