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

18
query/sexp/parser_test.go
View file

@ -67,10 +67,10 @@ func TestMemstoreBackedSexp(t *testing.T) {
if it.Type() != test.typ {
t.Errorf("Incorrect type for %s, got:%q expect %q", test.message, it.Type(), test.expect)
}
got, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
t.Errorf("Failed to %s", test.message)
}
got := it.Result()
if expect := ts.ValueOf(test.expect); got != expect {
t.Errorf("Incorrect result for %s, got:%v expect %v", test.message, got, expect)
}
@ -88,10 +88,10 @@ func TestTreeConstraintParse(t *testing.T) {
if it.Type() != graph.And {
t.Error("Odd iterator tree. Got: %s", it.DebugString(0))
}
out, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
t.Error("Got no results")
}
out := it.Result()
if out != ts.ValueOf("i") {
t.Errorf("Got %d, expected %d", out, ts.ValueOf("i"))
}
@ -105,8 +105,7 @@ func TestTreeConstraintTagParse(t *testing.T) {
"(:like\n" +
"($a (:is :good))))"
it := BuildIteratorTreeForQuery(ts, query)
_, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
t.Error("Got no results")
}
tags := make(map[string]graph.Value)
@ -135,15 +134,14 @@ func TestMultipleConstraintParse(t *testing.T) {
if it.Type() != graph.And {
t.Error("Odd iterator tree. Got: %s", it.DebugString(0))
}
out, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
t.Error("Got no results")
}
out := it.Result()
if out != ts.ValueOf("i") {
t.Errorf("Got %d, expected %d", out, ts.ValueOf("i"))
}
_, ok = graph.Next(it)
if ok {
if graph.Next(it) {
t.Error("Too many results")
}
}