Merge pull request Workiva#63 from alexandercampbell-wf/update_testify_failures

Update testify failures

Author: alexandercampbell-wk

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,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) {
@@ -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)
 }
 

btree/link/interface.go renamed to btree/_link/interface.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) {

btree/link/key.go renamed to btree/_link/key.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"

btree/link/mock_test.go renamed to btree/_link/mock_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())
 }