From b5eef7d44177b5801148a531a85a5cf856d6fa15 Mon Sep 17 00:00:00 2001 From: Alexander Campbell Date: Wed, 11 Feb 2015 08:29:44 -0600 Subject: [PATCH 1/5] Delete accidentally-added queue.prof --- queue/queue.prof | Bin 31096 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 queue/queue.prof diff --git a/queue/queue.prof b/queue/queue.prof deleted file mode 100644 index 6bddb3bed7359b46059d2669654604dfb71019d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31096 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 H$^ZW!42Z)u From bd4be26d11dcb8936d3492c1f75764f16c62117b Mon Sep 17 00:00:00 2001 From: Alexander Campbell Date: Wed, 11 Feb 2015 08:36:47 -0600 Subject: [PATCH 2/5] Add constant type annotation to assert.Equal Required with new version of Testify. --- queue/queue_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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()) } From 380534315597f4ce41091a3c0fb8d6042810793e Mon Sep 17 00:00:00 2001 From: Alexander Campbell Date: Wed, 11 Feb 2015 08:40:38 -0600 Subject: [PATCH 3/5] Annotate types in bitarray assert.Equal calls Fixes test failures with latest Testify. --- bitarray/bitarray_test.go | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) 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) } From dd77124e8a54f463c54ce521907761966f7654e1 Mon Sep 17 00:00:00 2001 From: Alexander Campbell Date: Wed, 11 Feb 2015 08:57:51 -0600 Subject: [PATCH 4/5] Use assert.Contains to fix btree.TestTreeGet --- btree/plus/btree_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) { From 6034e869e4d7795878f17314214fa1199ab17733 Mon Sep 17 00:00:00 2001 From: Alexander Campbell Date: Wed, 11 Feb 2015 08:59:37 -0600 Subject: [PATCH 5/5] Rename btree/link -> btree/_link until it's ready --- btree/{link => _link}/interface.go | 0 btree/{link => _link}/key.go | 0 btree/{link => _link}/mock_test.go | 0 btree/{link => _link}/node.go | 0 btree/{link => _link}/node_test.go | 0 btree/{link => _link}/tree.go | 0 btree/{link => _link}/tree_test.go | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename btree/{link => _link}/interface.go (100%) rename btree/{link => _link}/key.go (100%) rename btree/{link => _link}/mock_test.go (100%) rename btree/{link => _link}/node.go (100%) rename btree/{link => _link}/node_test.go (100%) rename btree/{link => _link}/tree.go (100%) rename btree/{link => _link}/tree_test.go (100%) 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