Merge pull request #63 from jezell/jezell/merge

Merge functions (in progress)

1 files changed, 75 insertions, 0 deletions

diff --git a/merge_test.go b/merge_test.go
new file mode 100644
index 0000000..3f9dc33
--- /dev/null
+++ b/merge_test.go
@@ -0,0 +1,75 @@
+package git
+
+import (
+	"testing"
+)
+
+func TestMergeWithSelf(t *testing.T) {
+
+	repo := createTestRepo(t)
+	seedTestRepo(t, repo)
+
+	master, err := repo.LookupReference("refs/heads/master")
+	checkFatal(t, err)
+
+	mergeHead, err := repo.MergeHeadFromRef(master)
+	checkFatal(t, err)
+
+	mergeHeads := make([]*MergeHead, 1)
+	mergeHeads[0] = mergeHead
+	err = repo.Merge(mergeHeads, nil, nil)
+	checkFatal(t, err)
+}
+
+func TestMergeAnalysisWithSelf(t *testing.T) {
+
+	repo := createTestRepo(t)
+	seedTestRepo(t, repo)
+
+	master, err := repo.LookupReference("refs/heads/master")
+	checkFatal(t, err)
+
+	mergeHead, err := repo.MergeHeadFromRef(master)
+	checkFatal(t, err)
+
+	mergeHeads := make([]*MergeHead, 1)
+	mergeHeads[0] = mergeHead
+	a, err := repo.MergeAnalysis(mergeHeads)
+	checkFatal(t, err)
+
+	if a != MergeAnalysisUpToDate {
+		t.Fatalf("Expected up to date merge, not %v", a)
+	}
+}
+
+func TestMergeSameFile(t *testing.T) {
+
+	file := MergeFileInput{
+		Path:     "test",
+		Mode:     33188,
+		Contents: []byte("hello world"),
+	}
+
+	result, err := MergeFile(file, file, file, nil)
+	checkFatal(t, err)
+	if !result.Automergeable {
+		t.Fatal("expected automergeable")
+	}
+	if result.Path != file.Path {
+		t.Fatal("path was incorrect")
+	}
+	if result.Mode != file.Mode {
+		t.Fatal("mode was incorrect")
+	}
+
+	compareBytes(t, file.Contents, result.Contents)
+
+}
+
+func compareBytes(t *testing.T, expected, actual []byte) {
+	for i, v := range expected {
+		if actual[i] != v {
+			t.Fatalf("Bad bytes")
+		}
+	}
+}