barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify Nexter interface

Browse source 
This change allows a Nexter to be used in the same manner as a scanner
using a for graph.Next(it) {} construction.

It is important that graph.Next(it) and any associated it.Result() calls
operate on the same iterator.
This commit is contained in:
kortschak 2014-08-01 09:15:02 +09:30
parent f8e28e066e
commit b1a70d99aa
31 changed files with 168 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

25
graph/iterator/and_iterator_test.go
View file

@ -36,10 +36,10 @@ func TestTag(t *testing.T) {
t.Errorf("Cannot get tag back, got %s", out[0])
}
val, ok := and.Next()
if !ok {
if !and.Next() {
t.Errorf("And did not next")
}
val := and.Result()
if val != 234 {
t.Errorf("Unexpected value")
}
@ -76,18 +76,15 @@ func TestAndAndFixedIterators(t *testing.T) {
t.Error("not accurate")
}
val, ok := and.Next()
if val != 3 || ok == false {
if !and.Next() || and.Result() != 3 {
t.Error("Incorrect first value")
}
val, ok = and.Next()
if val != 4 || ok == false {
if !and.Next() || and.Result() != 4 {
t.Error("Incorrect second value")
}
val, ok = and.Next()
if ok {
if and.Next() {
t.Error("Too many values")
}
@ -117,8 +114,7 @@ func TestNonOverlappingFixedIterators(t *testing.T) {
t.Error("not accurate")
}
_, ok := and.Next()
if ok {
if and.Next() {
t.Error("Too many values")
}
@ -131,18 +127,15 @@ func TestAllIterators(t *testing.T) {
and.AddSubIterator(all2)
and.AddSubIterator(all1)
val, ok := and.Next()
if val.(int64) != 4 || ok == false {
if !and.Next() || and.Result() != int64(4) {
t.Error("Incorrect first value")
}
val, ok = and.Next()
if val.(int64) != 5 || ok == false {
if !and.Next() || and.Result() != int64(5) {
t.Error("Incorrect second value")
}
val, ok = and.Next()
if ok {
if and.Next() {
t.Error("Too many values")
}