From 5590078e6ff04be425b4a833adb44a0845c0b52f Mon Sep 17 00:00:00 2001 From: Jesse Ezell Date: Thu, 20 Mar 2014 01:27:03 -0700 Subject: remove channel based iteration for branch / ref. Add ReferenceNameIterator. All iterators use Next(). Remove interfaces. --- reference_test.go | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) (limited to 'reference_test.go') diff --git a/reference_test.go b/reference_test.go index 911263a..bc970bf 100644 --- a/reference_test.go +++ b/reference_test.go @@ -106,10 +106,11 @@ func TestReferenceIterator(t *testing.T) { } // test some manual iteration - name, err := iter.NextName() + nameIter := iter.Names() + name, err := nameIter.Next() for err == nil { list = append(list, name) - name, err = iter.NextName() + name, err = nameIter.Next() } if err != ErrIterOver { t.Fatal("Iteration not over") @@ -122,10 +123,10 @@ func TestReferenceIterator(t *testing.T) { iter, err = repo.NewReferenceIterator() checkFatal(t, err) count := 0 - _, err = iter.NextReference() + _, err = iter.Next() for err == nil { count++ - _, err = iter.NextReference() + _, err = iter.Next() } if err != ErrIterOver { t.Fatal("Iteration not over") @@ -135,28 +136,6 @@ func TestReferenceIterator(t *testing.T) { t.Fatalf("Wrong number of references returned %v", count) } - // test the channel iteration - list = []string{} - iter, err = repo.NewReferenceIterator() - for name := range NameIteratorChannel(iter) { - list = append(list, name) - } - - sort.Strings(list) - compareStringList(t, expected, list) - - iter, err = repo.NewReferenceIteratorGlob("refs/heads/t*") - expected = []string{ - "refs/heads/three", - "refs/heads/two", - } - - list = []string{} - for name := range NameIteratorChannel(iter) { - list = append(list, name) - } - - compareStringList(t, expected, list) } func TestUtil(t *testing.T) { -- cgit v1.2.3