mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-31 03:18:43 -06:00
Code Issues Packages Projects Releases 124 Wiki Activity

Re-enable 'WalkTestSuite' in walk_test.go

Browse Source 
I accidentally left this commented out at some point, and it rusted
a bit when I made the change to have walk.doTreeWalk() walk over
chunks rather than values. So, re-enable the tests and fix them.
This commit is contained in:
Chris Masone
2015-07-27 14:10:07 -07:00
parent ed9d3578f6
commit 82ff8b9cd1
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
walk/walk_test.go
View File

@@ -12,7 +12,7 @@ import (
func TestWalkTestSuite(t *testing.T) {
suite.Run(t, &WalkAllTestSuite{})
//suite.Run(t, &WalkTestSuite{})
suite.Run(t, &WalkTestSuite{})
}
type WalkAllTestSuite struct {
@@ -80,7 +80,7 @@ type WalkTestSuite struct {
}
func (suite *WalkTestSuite) SetupTest() {
suite.shouldSee = types.NewString("zzz")
suite.shouldSee = types.NewList(types.NewString("zzz"))
suite.deadValue = types.UInt64(0xDEADBEEF)
suite.mustSkip = types.NewList(suite.deadValue)
suite.cs = &chunks.TestStore{}
@@ -101,15 +101,15 @@ func (suite *WalkTestSuite) skipWorker(composite types.Value) (reached []ref.Ref
reached = append(reached, r)
return r == suite.mustSkip.Ref()
})
return reached
return
}
// Skipping a sub-tree must allow other items in the list to be processed.
func (suite *WalkTestSuite) TestSkipListElement() {
wholeList := types.NewList(suite.mustSkip, suite.shouldSee, suite.shouldSee)
reached := suite.skipWorker(wholeList)
for _, r := range []ref.Ref{wholeList.Ref(), suite.mustSkip.Ref(), suite.shouldSee.Ref(), suite.shouldSee.Ref()} {
suite.Contains(reached, r)
for _, v := range []types.Value{wholeList, suite.mustSkip, suite.shouldSee, suite.shouldSee} {
suite.Contains(reached, v.Ref(), "Doesn't contain %+v", v)
}
suite.Len(reached, 4)
}
@@ -117,18 +117,27 @@ func (suite *WalkTestSuite) TestSkipListElement() {
func (suite *WalkTestSuite) TestSkipSetElement() {
wholeSet := types.NewSet(suite.mustSkip, suite.shouldSee).Insert(suite.shouldSee)
reached := suite.skipWorker(wholeSet)
suite.EqualValues(types.NewList(wholeSet, suite.mustSkip, suite.shouldSee), reached)
for _, v := range []types.Value{wholeSet, suite.mustSkip, suite.shouldSee} {
suite.Contains(reached, v.Ref(), "Doesn't contain %+v", v)
}
suite.Len(reached, 3)
}
func (suite *WalkTestSuite) TestSkipMapValue() {
shouldAlsoSee := types.NewString("Also good")
shouldAlsoSee := types.NewSet(types.NewString("Also good"))
wholeMap := types.NewMap(suite.shouldSee, suite.mustSkip, shouldAlsoSee, suite.shouldSee)
reached := suite.skipWorker(wholeMap)
suite.EqualValues(types.NewList(wholeMap, shouldAlsoSee, suite.shouldSee, suite.shouldSee, suite.mustSkip), reached)
for _, v := range []types.Value{wholeMap, suite.mustSkip, shouldAlsoSee, suite.shouldSee, suite.shouldSee} {
suite.Contains(reached, v.Ref(), "Doesn't contain %+v", v)
}
suite.Len(reached, 5)
}
func (suite *WalkTestSuite) TestSkipMapKey() {
wholeMap := types.NewMap(suite.mustSkip, suite.shouldSee, suite.shouldSee, suite.shouldSee)
reached := suite.skipWorker(wholeMap)
suite.EqualValues(types.NewList(wholeMap, suite.mustSkip, suite.shouldSee, suite.shouldSee, suite.shouldSee), reached)
for _, v := range []types.Value{wholeMap, suite.mustSkip, suite.shouldSee, suite.shouldSee, suite.shouldSee} {
suite.Contains(reached, v.Ref(), "Doesn't contain %+v", v)
}
suite.Len(reached, 5)
}