From 413aad030416e2632d07afbb70487ee4c7e98c50 Mon Sep 17 00:00:00 2001 From: emirpasic Date: Fri, 21 Sep 2018 01:09:03 +0200 Subject: [PATCH] - fix treeset iterator Last() function --- sets/treeset/iterator.go | 2 +- sets/treeset/treeset_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sets/treeset/iterator.go b/sets/treeset/iterator.go index 2cb465f..9dd6289 100644 --- a/sets/treeset/iterator.go +++ b/sets/treeset/iterator.go @@ -85,5 +85,5 @@ func (iterator *Iterator) First() bool { // Modifies the state of the iterator. func (iterator *Iterator) Last() bool { iterator.End() - return iterator.iterator.Last() + return iterator.Prev() } diff --git a/sets/treeset/treeset_test.go b/sets/treeset/treeset_test.go index 0f4b667..0dfe39b 100644 --- a/sets/treeset/treeset_test.go +++ b/sets/treeset/treeset_test.go @@ -265,10 +265,10 @@ func TestSetIteratorPrev(t *testing.T) { } func TestSetIteratorBegin(t *testing.T) { - m := NewWithStringComparator() - it := m.Iterator() + set := NewWithStringComparator() + it := set.Iterator() it.Begin() - m.Add("a", "b", "c") + set.Add("a", "b", "c") for it.Next() { } it.Begin() @@ -322,8 +322,8 @@ func TestSetIteratorLast(t *testing.T) { if actualValue, expectedValue := it.Last(), true; actualValue != expectedValue { t.Errorf("Got %v expected %v", actualValue, expectedValue) } - if index, value := it.Index(), it.Value(); index != 3 || value != "c" { - t.Errorf("Got %v,%v expected %v,%v", index, value, 3, "c") + if index, value := it.Index(), it.Value(); index != 2 || value != "c" { + t.Errorf("Got %v,%v expected %v,%v", index, value, 2, "c") } }