Merge pull request #142 from Workiva/queue_take_until

Fix index in take until.

Author: dustinhiatt-wf

queue/queue.go

@@ -115,17 +115,18 @@ func (items *items) getUntil(checker func(item interface{}) bool) []interface{}
 	}
 
 	returnItems := make([]interface{}, 0, length)
-	index := 0
+	index := -1
 	for i, item := range *items {
 		if !checker(item) {
 			break
 		}
 
 		returnItems = append(returnItems, item)
 		index = i
+		(*items)[i] = nil // prevent memory leak
 	}
 
-	*items = (*items)[index:]
+	*items = (*items)[index+1:]
 	return returnItems
 }
 

queue/queue_test.go

@@ -384,6 +384,30 @@ func TestTakeUntilEmptyQueue(t *testing.T) {
 	assert.Equal(t, expected, result)
 }
 
+func TestTakeUntilThenGet(t *testing.T) {
+	q := New(10)
+	q.Put(`a`, `b`, `c`)
+	takeItems, _ := q.TakeUntil(func(item interface{}) bool {
+		return item != `c`
+	})
+
+	restItems, _ := q.Get(3)
+	assert.Equal(t, []interface{}{`a`, `b`}, takeItems)
+	assert.Equal(t, []interface{}{`c`}, restItems)
+}
+
+func TestTakeUntilNoMatches(t *testing.T) {
+	q := New(10)
+	q.Put(`a`, `b`, `c`)
+	takeItems, _ := q.TakeUntil(func(item interface{}) bool {
+		return item != `a`
+	})
+
+	restItems, _ := q.Get(3)
+	assert.Equal(t, []interface{}{}, takeItems)
+	assert.Equal(t, []interface{}{`a`, `b`, `c`}, restItems)
+}
+
 func TestTakeUntilOnDisposedQueue(t *testing.T) {
 	q := New(10)
 	q.Dispose()