Skip to content

Update testify failures #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 11, 2015
Merged

Update testify failures #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5eef7d
Delete accidentally-added queue.prof
alexandercampbell-wk Feb 11, 2015
bd4be26
Add constant type annotation to assert.Equal
alexandercampbell-wk Feb 11, 2015
3805343
Annotate types in bitarray assert.Equal calls
alexandercampbell-wk Feb 11, 2015
dd77124
Use assert.Contains to fix btree.TestTreeGet
alexandercampbell-wk Feb 11, 2015
6034e86
Rename btree/link -> btree/_link until it's ready
alexandercampbell-wk Feb 11, 2015
3d8df8e
Merge branch 'master' into update_testify_failures
alexandercampbell-wk Feb 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions bitarray/bitarray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,18 +291,18 @@ func TestSetHighestLowest(t *testing.T) {
ba := newBitArray(10)

assert.False(t, ba.anyset)
assert.Equal(t, 0, ba.lowest)
assert.Equal(t, 0, ba.highest)
assert.Equal(t, uint64(0), ba.lowest)
assert.Equal(t, uint64(0), ba.highest)

ba.SetBit(5)

assert.True(t, ba.anyset)
assert.Equal(t, 5, ba.lowest)
assert.Equal(t, 5, ba.highest)
assert.Equal(t, uint64(5), ba.lowest)
assert.Equal(t, uint64(5), ba.highest)

ba.SetBit(8)
assert.Equal(t, 5, ba.lowest)
assert.Equal(t, 8, ba.highest)
assert.Equal(t, uint64(5), ba.lowest)
assert.Equal(t, uint64(8), ba.highest)
}

func TestGetBitAtCapacity(t *testing.T) {
Expand Down Expand Up @@ -330,42 +330,42 @@ func TestClearHighestLowest(t *testing.T) {
ba.ClearBit(5)

assert.False(t, ba.anyset)
assert.Equal(t, 0, ba.lowest)
assert.Equal(t, 0, ba.highest)
assert.Equal(t, uint64(0), ba.lowest)
assert.Equal(t, uint64(0), ba.highest)

ba.SetBit(3)
ba.SetBit(5)
ba.SetBit(7)

ba.ClearBit(7)
assert.True(t, ba.anyset)
assert.Equal(t, 5, ba.highest)
assert.Equal(t, 3, ba.lowest)
assert.Equal(t, uint64(5), ba.highest)
assert.Equal(t, uint64(3), ba.lowest)

ba.SetBit(7)
ba.ClearBit(3)
assert.True(t, ba.anyset)
assert.Equal(t, 5, ba.lowest)
assert.Equal(t, 7, ba.highest)
assert.Equal(t, uint64(5), ba.lowest)
assert.Equal(t, uint64(7), ba.highest)

ba.ClearBit(7)
assert.True(t, ba.anyset)
assert.Equal(t, 5, ba.lowest)
assert.Equal(t, 5, ba.highest)
assert.Equal(t, uint64(5), ba.lowest)
assert.Equal(t, uint64(5), ba.highest)

ba.ClearBit(5)
assert.False(t, ba.anyset)
assert.Equal(t, 0, ba.lowest)
assert.Equal(t, 0, ba.highest)
assert.Equal(t, uint64(0), ba.lowest)
assert.Equal(t, uint64(0), ba.highest)
}

func TestComplementResetsBounds(t *testing.T) {
ba := newBitArray(5)

ba.complement()
assert.True(t, ba.anyset)
assert.Equal(t, 0, ba.lowest)
assert.Equal(t, s-1, ba.highest)
assert.Equal(t, uint64(0), ba.lowest)
assert.Equal(t, uint64(s-1), ba.highest)
}

func TestBitArrayIntersectsSparse(t *testing.T) {
Expand Down Expand Up @@ -413,7 +413,7 @@ func TestConstructorSetBitArray(t *testing.T) {
assert.Nil(t, err)
assert.True(t, result)
assert.Equal(t, s-1, ba.highest)
assert.Equal(t, 0, ba.lowest)
assert.Equal(t, uint64(0), ba.lowest)
assert.True(t, ba.anyset)
}

Expand Down
0 btree/link/interface.go → btree/_link/interface.go
View file
Open in desktop
File renamed without changes.
0 btree/link/key.go → btree/_link/key.go
View file
Open in desktop
File renamed without changes.
0 btree/link/mock_test.go → btree/_link/mock_test.go
View file
Open in desktop
File renamed without changes.
0 btree/link/node.go → btree/_link/node.go
View file
Open in desktop
File renamed without changes.
0 btree/link/node_test.go → btree/_link/node_test.go
View file
Open in desktop
File renamed without changes.
0 btree/link/tree.go → btree/_link/tree.go
View file
Open in desktop
File renamed without changes.
0 btree/link/tree_test.go → btree/_link/tree_test.go
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion btree/plus/btree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,10 @@ func TestTreeGet(t *testing.T) {
tree.Insert(keys...)

assert.Equal(t, uint64(100), tree.Len())
assert.Equal(t, keys, tree.Get(keys...))
fromTree := tree.Get(keys...)
for _, key := range keys {
assert.Contains(t, fromTree, key)
}
}

func TestTreeGetNotFound(t *testing.T) {
Expand Down
1 change: 0 additions & 1 deletion datastructures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ importing this package instead of each subpackage individually.
import (
_ "github.com/Workiva/go-datastructures/augmentedtree"
_ "github.com/Workiva/go-datastructures/bitarray"
_ "github.com/Workiva/go-datastructures/btree/link"
_ "github.com/Workiva/go-datastructures/btree/palm"
_ "github.com/Workiva/go-datastructures/btree/plus"
_ "github.com/Workiva/go-datastructures/futures"
Expand Down
Binary file removed queue/queue.prof
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions queue/queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,12 @@ func TestExecuteInParallel(t *testing.T) {

numCalls := uint64(0)

ExecuteInParallel(q, func(interface{}) {
ExecuteInParallel(q, func(item interface{}) {
t.Logf("ExecuteInParallel called us with %+v", item)
atomic.AddUint64(&numCalls, 1)
})

assert.Equal(t, 10, numCalls)
assert.Equal(t, uint64(10), numCalls)
assert.True(t, q.Disposed())
}

Expand Down