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

Address review comments

Browse source
This commit is contained in:
Andrew Dunham 2015-04-15 16:28:13 -07:00
parent 430ff507f0
commit 5eed4d9667
19 changed files with 125 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

18
graph/iterator/materialize_iterator_test.go
View file

@ -17,13 +17,11 @@ package iterator
import (
"errors"
"testing"
//"github.com/google/cayley/graph"
)
func TestMaterializeIteratorError(t *testing.T) {
retErr := errors.New("unique")
errIt := newTestIterator(false, retErr)
wantErr := errors.New("unique")
errIt := newTestIterator(false, wantErr)
// This tests that we properly return 0 results and the error when the
// underlying iterator returns an error.
@ -32,14 +30,14 @@ func TestMaterializeIteratorError(t *testing.T) {
if mIt.Next() != false {
t.Errorf("Materialize iterator did not pass through underlying 'false'")
}
if mIt.Err() != retErr {
if mIt.Err() != wantErr {
t.Errorf("Materialize iterator did not pass through underlying Err")
}
}
func TestMaterializeIteratorErrorAbort(t *testing.T) {
retErr := errors.New("unique")
errIt := newTestIterator(false, retErr)
wantErr := errors.New("unique")
errIt := newTestIterator(false, wantErr)
// This tests that we properly return 0 results and the error when the
// underlying iterator is larger than our 'abort at' value, and then
@ -50,7 +48,7 @@ func TestMaterializeIteratorErrorAbort(t *testing.T) {
mIt := NewMaterialize(or)
// Should get all the underlying values...
// We should get all the underlying values...
for i := 0; i < abortMaterializeAt+1; i++ {
if !mIt.Next() {
t.Errorf("Materialize iterator returned spurious 'false' on iteration %d", i)
@ -62,11 +60,11 @@ func TestMaterializeIteratorErrorAbort(t *testing.T) {
}
}
// ... and then the error value
// ... and then the error value.
if mIt.Next() != false {
t.Errorf("Materialize iterator did not pass through underlying 'false'")
}
if mIt.Err() != retErr {
if mIt.Err() != wantErr {
t.Errorf("Materialize iterator did not pass through underlying Err")
}
}