diff options
| -rw-r--r-- | mergebase/integration_test.go | 6 | ||||
| -rw-r--r-- | mergebase/unit_test.go | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mergebase/integration_test.go b/mergebase/integration_test.go index d4625828..3d85409d 100644 --- a/mergebase/integration_test.go +++ b/mergebase/integration_test.go @@ -35,10 +35,12 @@ func TestQueryMatchesGitMergeBaseAll(t *testing.T) { store := testRepo.OpenObjectStore(t) query := mergebase.Query(store, nil, left, tag) + all, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) } + got := oidSetFromSlice(all) want := gitMergeBaseAllSet(t, testRepo, left, tag) @@ -76,10 +78,12 @@ func TestQueryCrissCrossMatchesGitMergeBaseAll(t *testing.T) { store := testRepo.OpenObjectStore(t) query := mergebase.Query(store, nil, left, right) + all, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) } + got := oidSetFromSlice(all) want := gitMergeBaseAllSet(t, testRepo, left, right) @@ -135,10 +139,12 @@ func TestQueryMatchesGitMergeBaseAllWithCommitGraph(t *testing.T) { graph := testRepo.OpenCommitGraph(t) query := mergebase.Query(store, graph, left, right) + all, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) } + got := oidSetFromSlice(all) want := gitMergeBaseAllSet(t, testRepo, left, right) diff --git a/mergebase/unit_test.go b/mergebase/unit_test.go index 7e4e0244..7ba1ed66 100644 --- a/mergebase/unit_test.go +++ b/mergebase/unit_test.go @@ -84,6 +84,7 @@ func TestQueryLinearHistory(t *testing.T) { right := store.AddObject(objecttype.TypeCommit, commitBody(tree, left)) query := mergebase.Query(store, nil, left, right) + got, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) @@ -130,6 +131,7 @@ func TestQueryPeelsAnnotatedTags(t *testing.T) { tag := store.AddObject(objecttype.TypeTag, tagBody(right, objecttype.TypeCommit)) query := mergebase.Query(store, nil, left, tag) + got, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) @@ -179,10 +181,12 @@ func TestQueryCrissCrossReturnsAllBestCommonAncestors(t *testing.T) { right := store.AddObject(objecttype.TypeCommit, commitBody(rightTree, base2, base1)) query := mergebase.Query(store, nil, left, right) + all, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) } + got := toSet(all) want := map[objectid.ObjectID]struct{}{base1: {}, base2: {}} @@ -226,6 +230,7 @@ func TestQueryReturnsNoResultWhenNoCommonAncestorExists(t *testing.T) { right := store.AddObject(objecttype.TypeCommit, commitBody(rightTree)) query := mergebase.Query(store, nil, left, right) + got, err := query.All() if err != nil { t.Fatalf("query.All(): %v", err) @@ -261,6 +266,7 @@ func TestQueryRejectsNonCommitAfterPeel(t *testing.T) { tagToTree := store.AddObject(objecttype.TypeTag, tagBody(tree, objecttype.TypeTree)) query := mergebase.Query(store, nil, commit, tagToTree) + _, err := query.All() if err == nil { t.Fatal("expected error") |