Replace convey with assert package for clz_test.go, ctz_test.go, fast…

…aggregation_test.go

byte_input_test.go

@@ -48,7 +48,7 @@ func TestByteInputFlow(t *testing.T) {
 			assert.NoError(t, err)
 
 			p, err := input.readUInt32()
-			assert.EqualValues(t,  2097162, p) // 32 << 16 | 10
+			assert.EqualValues(t, 2097162, p) // 32 << 16 | 10
 			assert.NoError(t, err)
 
 			b, err := input.next(2)

clz_test.go

@@ -1,7 +1,7 @@
 package roaring
 
 import (
-	. "github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
@@ -37,15 +37,12 @@ func numberOfLeadingZeros(i uint64) int {
 }
 
 func TestCountLeadingZeros072(t *testing.T) {
-	Convey("countLeadingZeros", t, func() {
-		So(numberOfLeadingZeros(0), ShouldEqual, 64)
-		So(numberOfLeadingZeros(8), ShouldEqual, 60)
-		So(numberOfLeadingZeros(1<<17), ShouldEqual, 64-17-1)
-		So(numberOfLeadingZeros(0xFFFFFFFFFFFFFFFF), ShouldEqual, 0)
-		So(countLeadingZeros(0), ShouldEqual, 64)
-		So(countLeadingZeros(8), ShouldEqual, 60)
-		So(countLeadingZeros(1<<17), ShouldEqual, 64-17-1)
-		So(countLeadingZeros(0xFFFFFFFFFFFFFFFF), ShouldEqual, 0)
-
-	})
+	assert.Equal(t, 64, numberOfLeadingZeros(0))
+	assert.Equal(t, 60, numberOfLeadingZeros(8))
+	assert.Equal(t, 64-17-1, numberOfLeadingZeros(1<<17))
+	assert.Equal(t, 0, numberOfLeadingZeros(0xFFFFFFFFFFFFFFFF))
+	assert.Equal(t, 64, countLeadingZeros(0))
+	assert.Equal(t, 60, countLeadingZeros(8))
+	assert.Equal(t, 64-17-1, countLeadingZeros(1<<17))
+	assert.Equal(t, 0, countLeadingZeros(0xFFFFFFFFFFFFFFFF))
 }

ctz_test.go

@@ -2,29 +2,25 @@ package roaring
 
 import (
 	"encoding/binary"
+	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
-
-	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestCountTrailingZeros072(t *testing.T) {
-	Convey("countTrailingZeros", t, func() {
-		So(numberOfTrailingZeros(0), ShouldEqual, 64)
-		So(numberOfTrailingZeros(8), ShouldEqual, 3)
-		So(numberOfTrailingZeros(7), ShouldEqual, 0)
-		So(numberOfTrailingZeros(1<<17), ShouldEqual, 17)
-		So(numberOfTrailingZeros(7<<17), ShouldEqual, 17)
-		So(numberOfTrailingZeros(255<<33), ShouldEqual, 33)
-
-		So(countTrailingZeros(0), ShouldEqual, 64)
-		So(countTrailingZeros(8), ShouldEqual, 3)
-		So(countTrailingZeros(7), ShouldEqual, 0)
-		So(countTrailingZeros(1<<17), ShouldEqual, 17)
-		So(countTrailingZeros(7<<17), ShouldEqual, 17)
-		So(countTrailingZeros(255<<33), ShouldEqual, 33)
+	assert.Equal(t, 64, numberOfTrailingZeros(0))
+	assert.Equal(t, 3, numberOfTrailingZeros(8))
+	assert.Equal(t, 0, numberOfTrailingZeros(7))
+	assert.Equal(t, 17, numberOfTrailingZeros(1<<17))
+	assert.Equal(t, 17, numberOfTrailingZeros(7<<17))
+	assert.Equal(t, 33, numberOfTrailingZeros(255<<33))
 
-	})
+	assert.Equal(t, 64, countTrailingZeros(0))
+	assert.Equal(t, 3, countTrailingZeros(8))
+	assert.Equal(t, 0, countTrailingZeros(7))
+	assert.Equal(t, 17, countTrailingZeros(1<<17))
+	assert.Equal(t, 17, countTrailingZeros(7<<17))
+	assert.Equal(t, 33, countTrailingZeros(255<<33))
 }
 
 func getRandomUint64Set(n int) []uint64 {