Revert "split batcher_test into separate t.Run()s"

This reverts commit 912f8f652f6a5926e5903647c3a76ec294ef32da.

pkg/reporting/batcher_test.go

@@ -20,74 +20,58 @@ func TestEventBatching(t *testing.T) {
 
 	// First batch:
 	// Add a small number of items to the batch, and then explicitly request early completion.
-	t.Run("b1", func(t *testing.T) {
-		batcher.enqueue("b1-1")
-		batcher.enqueue("b1-2")
-		// check that there is not anything completed:
-		assert.Equal(t, false, notified)
-		assert.Equal(t, 0, batcher.completedCount())
-		// Request early completion:
-		batcher.finishOngoing()
-		// check that this batch was completed:
-		assert.Equal(t, true, notified)
-		assert.Equal(t, 1, batcher.completedCount())
-		assert.Equal(t, batch[string]{events: []string{"b1-1", "b1-2"}}, batcher.peekLatestCompleted())
-		notified = false // reset the notification
-	})
+	batcher.enqueue("b1-1")
+	batcher.enqueue("b1-2")
+	// check that there is not anything completed:
+	assert.Equal(t, false, notified)
+	assert.Equal(t, 0, batcher.completedCount())
+	// Request early completion:
+	batcher.finishOngoing()
+	// check that this batch was completed:
+	assert.Equal(t, true, notified)
+	assert.Equal(t, 1, batcher.completedCount())
+	assert.Equal(t, batch[string]{events: []string{"b1-1", "b1-2"}}, batcher.peekLatestCompleted())
 	// clear the current batch:
+	notified = false
 	batcher.dropLatestCompleted()
 
 	// Second, third, and fourth batches:
 	// Add enough events that three batches are automatically created of appropriate sizes, and
 	// check that
-	t.Run("b2-enqueue", func(t *testing.T) {
-		batcher.enqueue("b2-1")
-		batcher.enqueue("b2-2")
-		assert.Equal(t, false, notified)
-		batcher.enqueue("b2-3")
-		assert.Equal(t, true, notified)
-		notified = false // reset the notification
-	})
-	t.Run("b3-enqueue", func(t *testing.T) {
-		batcher.enqueue("b3-1")
-		batcher.enqueue("b3-2")
-		assert.Equal(t, false, notified)
-		batcher.enqueue("b3-3")
-		assert.Equal(t, true, notified)
-		notified = false // reset the notification
-	})
-	t.Run("peek-b2-b3", func(t *testing.T) {
-		// check that the batches so far match what we expect:
-		assert.Equal(t, 2, batcher.completedCount())
-		assert.Equal(t, batch[string]{events: []string{"b2-1", "b2-2", "b2-3"}}, batcher.peekLatestCompleted())
-	})
-	t.Run("b4-enqueue", func(t *testing.T) {
-		// add the last batch:
-		batcher.enqueue("b4-1")
-		batcher.enqueue("b4-2")
-		assert.Equal(t, false, notified)
-		batcher.enqueue("b4-3")
-		assert.Equal(t, true, notified)
-	})
+	batcher.enqueue("b2-1")
+	batcher.enqueue("b2-2")
+	assert.Equal(t, false, notified)
+	batcher.enqueue("b2-3")
+	assert.Equal(t, true, notified)
+	notified = false // reset the notification
+	batcher.enqueue("b3-1")
+	batcher.enqueue("b3-2")
+	assert.Equal(t, false, notified)
+	batcher.enqueue("b3-3")
+	assert.Equal(t, true, notified)
+	notified = false // reset the notification
+	// check that the batches so far match what we expect:
+	assert.Equal(t, 2, batcher.completedCount())
+	assert.Equal(t, batch[string]{events: []string{"b2-1", "b2-2", "b2-3"}}, batcher.peekLatestCompleted())
+	// add the last batch:
+	batcher.enqueue("b4-1")
+	batcher.enqueue("b4-2")
+	assert.Equal(t, false, notified)
+	batcher.enqueue("b4-3")
+	assert.Equal(t, true, notified)
 	// Check that the final batches are what we expect
-	t.Run("peek-b2-b3-b4", func(t *testing.T) {
-		assert.Equal(t, 3, batcher.completedCount())
-		assert.Equal(t, batch[string]{events: []string{"b2-1", "b2-2", "b2-3"}}, batcher.peekLatestCompleted())
-	})
+	assert.Equal(t, 3, batcher.completedCount())
+	assert.Equal(t, batch[string]{events: []string{"b2-1", "b2-2", "b2-3"}}, batcher.peekLatestCompleted())
 	// Consume one batch:
 	batcher.dropLatestCompleted()
 	// and now, it should just be b3 and b4:
-	t.Run("peek-b3-b4", func(t *testing.T) {
-		assert.Equal(t, 2, batcher.completedCount())
-		assert.Equal(t, batch[string]{events: []string{"b3-1", "b3-2", "b3-3"}}, batcher.peekLatestCompleted())
-	})
+	assert.Equal(t, 2, batcher.completedCount())
+	assert.Equal(t, batch[string]{events: []string{"b3-1", "b3-2", "b3-3"}}, batcher.peekLatestCompleted())
 	// consume b3:
 	batcher.dropLatestCompleted()
 	// ... so it should just be b4:
-	t.Run("peek-b4", func(t *testing.T) {
-		assert.Equal(t, 1, batcher.completedCount())
-		assert.Equal(t, batch[string]{events: []string{"b4-1", "b4-2", "b4-3"}}, batcher.peekLatestCompleted())
-	})
+	assert.Equal(t, 1, batcher.completedCount())
+	assert.Equal(t, batch[string]{events: []string{"b4-1", "b4-2", "b4-3"}}, batcher.peekLatestCompleted())
 	// and after consuming the last one...
 	batcher.dropLatestCompleted()
 	// ... there should be nothing left: