diff --git a/bitarray/bitarray_test.go b/bitarray/bitarray_test.go index 32cb982..62c907c 100644 --- a/bitarray/bitarray_test.go +++ b/bitarray/bitarray_test.go @@ -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) { @@ -330,8 +330,8 @@ 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) @@ -339,24 +339,24 @@ func TestClearHighestLowest(t *testing.T) { 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) { @@ -364,8 +364,8 @@ func TestComplementResetsBounds(t *testing.T) { 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) { @@ -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) } diff --git a/btree/link/interface.go b/btree/_link/interface.go similarity index 100% rename from btree/link/interface.go rename to btree/_link/interface.go diff --git a/btree/link/key.go b/btree/_link/key.go similarity index 100% rename from btree/link/key.go rename to btree/_link/key.go diff --git a/btree/link/mock_test.go b/btree/_link/mock_test.go similarity index 100% rename from btree/link/mock_test.go rename to btree/_link/mock_test.go diff --git a/btree/link/node.go b/btree/_link/node.go similarity index 100% rename from btree/link/node.go rename to btree/_link/node.go diff --git a/btree/link/node_test.go b/btree/_link/node_test.go similarity index 100% rename from btree/link/node_test.go rename to btree/_link/node_test.go diff --git a/btree/link/tree.go b/btree/_link/tree.go similarity index 100% rename from btree/link/tree.go rename to btree/_link/tree.go diff --git a/btree/link/tree_test.go b/btree/_link/tree_test.go similarity index 100% rename from btree/link/tree_test.go rename to btree/_link/tree_test.go diff --git a/btree/plus/btree_test.go b/btree/plus/btree_test.go index 1a6a777..4af62e0 100644 --- a/btree/plus/btree_test.go +++ b/btree/plus/btree_test.go @@ -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) { diff --git a/datastructures.go b/datastructures.go index 5b6992f..bf09c6d 100644 --- a/datastructures.go +++ b/datastructures.go @@ -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" diff --git a/queue/queue.prof b/queue/queue.prof deleted file mode 100644 index 6bddb3b..0000000 Binary files a/queue/queue.prof and /dev/null differ diff --git a/queue/queue_test.go b/queue/queue_test.go index 6536d9d..fbaf514 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -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()) }