diff options
Diffstat (limited to 'objects_test.go')
| -rw-r--r-- | objects_test.go | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/objects_test.go b/objects_test.go index 2bb0d486..3a3e641f 100644 --- a/objects_test.go +++ b/objects_test.go @@ -9,7 +9,7 @@ import ( ) func mustHash(t *testing.T, hex string) Hash { - id, err := ParseHash(hex) + id, err := ParseHashWithSize(hex, testHashSize) if err != nil { t.Fatalf("ParseHash failed: %v", err) } @@ -18,7 +18,7 @@ func mustHash(t *testing.T, hex string) Hash { func hashWithByte(fill byte) Hash { var h Hash - for i := range h { + for i := 0; i < testHashSize; i++ { h[i] = fill fill++ } @@ -27,11 +27,11 @@ func hashWithByte(fill byte) Hash { func TestLoosePathUsesExpectedLayout(t *testing.T) { pattern := "0123456789abcdef" - repeats := (HashSize*2 + len(pattern) - 1) / len(pattern) - hexStr := strings.Repeat(pattern, repeats)[:HashSize*2] + repeats := (testHashSize*2 + len(pattern) - 1) / len(pattern) + hexStr := strings.Repeat(pattern, repeats)[:testHashSize*2] id := mustHash(t, hexStr) expect := filepath.Join("objects", hexStr[:2], hexStr[2:]) - if got := loosePath(id); got != expect { + if got := loosePath(id, testHashSize); got != expect { t.Fatalf("unexpected loose path: %q", got) } } @@ -49,7 +49,7 @@ func TestParseBlobAndSerialize(t *testing.T) { if blob.Hash != id { t.Fatalf("blob hash mismatch: %v", blob.Hash) } - raw, err := blob.Serialize() + raw, err := blob.Serialize(testHashSize) if err != nil { t.Fatalf("Serialize error: %v", err) } @@ -68,9 +68,9 @@ func TestParseTreeAndSerialize(t *testing.T) { {Mode: 0100644, Name: []byte("file.txt"), ID: hashWithByte(0x20)}, {Mode: 040000, Name: []byte("subdir"), ID: hashWithByte(0x30)}, } - body := treeBody(&Tree{Entries: entries}) + body := treeBody(&Tree{Entries: entries}, testHashSize) id := hashWithByte(0x40) - tree, err := parseTree(id, body) + tree, err := parseTree(id, body, testHashSize) if err != nil { t.Fatalf("parseTree error: %v", err) } @@ -82,7 +82,7 @@ func TestParseTreeAndSerialize(t *testing.T) { t.Fatalf("entry %d mismatch", i) } } - serialized, err := (&Tree{Entries: entries}).Serialize() + serialized, err := (&Tree{Entries: entries}).Serialize(testHashSize) if err != nil { t.Fatalf("Serialize error: %v", err) } @@ -103,8 +103,8 @@ func TestParseCommitWithExtraHeader(t *testing.T) { OffsetMinutes: -420, } var buf bytes.Buffer - fmt.Fprintf(&buf, "tree %s\n", treeID.String()) - fmt.Fprintf(&buf, "parent %s\n", parent.String()) + fmt.Fprintf(&buf, "tree %s\n", treeID.StringWithSize(testHashSize)) + fmt.Fprintf(&buf, "parent %s\n", parent.StringWithSize(testHashSize)) buf.WriteString("author ") buf.Write(ident.Serialize()) buf.WriteByte('\n') @@ -112,7 +112,7 @@ func TestParseCommitWithExtraHeader(t *testing.T) { buf.Write(ident.Serialize()) buf.WriteByte('\n') buf.WriteString("extra data\n\nMessage body\n") - commit, err := parseCommit(hashWithByte(0x70), buf.Bytes()) + commit, err := parseCommit(hashWithByte(0x70), buf.Bytes(), testHashSize) if err != nil { t.Fatalf("parseCommit error: %v", err) } @@ -136,11 +136,11 @@ func TestParseCommitWithExtraHeader(t *testing.T) { Committer: ident, Message: []byte("Message body\n"), } - raw, err := roundTrip.Serialize() + raw, err := roundTrip.Serialize(testHashSize) if err != nil { t.Fatalf("Serialize error: %v", err) } - if !strings.Contains(string(raw), "tree "+treeID.String()) { + if !strings.Contains(string(raw), "tree "+treeID.StringWithSize(testHashSize)) { t.Fatalf("serialized commit missing tree header") } } @@ -155,7 +155,7 @@ func TestParseTagAndSerialize(t *testing.T) { } var buf bytes.Buffer buf.WriteString("object ") - buf.WriteString(target.String()) + buf.WriteString(target.StringWithSize(testHashSize)) buf.WriteByte('\n') buf.WriteString("type commit\n") buf.WriteString("tag v1.0\n") @@ -163,7 +163,7 @@ func TestParseTagAndSerialize(t *testing.T) { buf.Write(tagger.Serialize()) buf.WriteString("\n\nannotated tag\n") body := append([]byte(nil), buf.Bytes()...) - tag, err := parseTag(hashWithByte(0x90), body) + tag, err := parseTag(hashWithByte(0x90), body, testHashSize) if err != nil { t.Fatalf("parseTag error: %v", err) } @@ -179,7 +179,7 @@ func TestParseTagAndSerialize(t *testing.T) { if string(tag.Name) != "v1.0" { t.Fatalf("tag name mismatch: %q", tag.Name) } - serialized, err := tag.Serialize() + serialized, err := tag.Serialize(testHashSize) if err != nil { t.Fatalf("Serialize error: %v", err) } |