Merge pull request #267 from RoaringBitmap/dlemire/better_tests

Fix for issue 266.

Author: lemire

roaring64/iterables64.go

@@ -1,6 +1,8 @@
 package roaring64
 
-import "github.com/RoaringBitmap/roaring"
+import (
+	"github.com/RoaringBitmap/roaring"
+)
 
 // IntIterable64 allows you to iterate over the values in a Bitmap
 type IntIterable64 interface {
@@ -33,13 +35,14 @@ func (ii *intIterator) HasNext() bool {
 func (ii *intIterator) init() {
 	if ii.highlowcontainer.size() > ii.pos {
 		ii.iter = ii.highlowcontainer.getContainerAtIndex(ii.pos).Iterator()
-		ii.hs = uint64(ii.highlowcontainer.getKeyAtIndex(ii.pos)) << 16
+		ii.hs = uint64(ii.highlowcontainer.getKeyAtIndex(ii.pos)) << 32
 	}
 }
 
 // Next returns the next integer
 func (ii *intIterator) Next() uint64 {
-	x := uint64(ii.iter.Next()) | ii.hs
+	lowbits := ii.iter.Next()
+	x := uint64(lowbits) | ii.hs
 	if !ii.iter.HasNext() {
 		ii.pos = ii.pos + 1
 		ii.init()

roaring64/roaring64_test.go

@@ -1,6 +1,7 @@
 package roaring64
 
 import (
+	"fmt"
 	"log"
 	"math"
 	"math/rand"
@@ -26,6 +27,26 @@ func TestRoaringIntervalCheck(t *testing.T) {
 	assert.False(t, r.Intersects(rangeb2))
 }
 
+func TestIssue266(t *testing.T) {
+	r := BitmapOf(12345, 5764607714248818780)
+	assert.EqualValues(t, 2, r.GetCardinality())
+	assert.EqualValues(t, 2, r.GetCardinality())
+	assert.EqualValues(t, true, r.Contains(12345))
+	assert.EqualValues(t, true, r.Contains(5764607714248818780))
+
+	i := r.Iterator()
+
+	if assert.True(t, i.HasNext()) {
+		assert.EqualValues(t, 12345, i.Next())
+		if assert.True(t, i.HasNext()) {
+			assert.EqualValues(t, uint64(5764607714248818780), i.Next())
+			assert.False(t, i.HasNext())
+		}
+	}
+
+	fmt.Println(r.String())
+}
+
 func TestRoaringRangeEnd(t *testing.T) {
 	r := New()
 	r.Add(roaring.MaxUint32)