catch expanded events

Author: FGasper

internal/verifier/change_stream_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/10gen/migration-verifier/mslices"
 	"github.com/pkg/errors"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/require"
@@ -35,6 +36,12 @@ func TestChangeStreamFilter(t *testing.T) {
 // terminates that verifier, updates the source cluster, starts a new
 // verifier with change stream, and confirms that things look as they should.
 func (suite *IntegrationTestSuite) TestChangeStreamResumability() {
+	suite.Require().NoError(
+		suite.srcMongoClient.
+			Database(suite.DBNameForTest()).
+			CreateCollection(suite.Context(), "testColl"),
+	)
+
 	func() {
 		verifier1 := suite.BuildVerifier()
 		ctx, cancel := context.WithCancel(context.Background())
@@ -43,7 +50,7 @@ func (suite *IntegrationTestSuite) TestChangeStreamResumability() {
 		suite.Require().NoError(err)
 	}()
 
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(suite.Context())
 	defer cancel()
 
 	_, err := suite.srcMongoClient.
@@ -213,14 +220,21 @@ func (suite *IntegrationTestSuite) TestNoStartAtTime() {
 }
 
 func (suite *IntegrationTestSuite) TestWithChangeEventsBatching() {
-	verifier := suite.BuildVerifier()
+	ctx := suite.Context()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	db := suite.srcMongoClient.Database(suite.DBNameForTest())
+	coll1 := db.Collection("testColl1")
+	coll2 := db.Collection("testColl2")
+
+	for _, coll := range mslices.Of(coll1, coll2) {
+		suite.Require().NoError(db.CreateCollection(ctx, coll.Name()))
+	}
+
+	verifier := suite.BuildVerifier()
 
 	suite.Require().NoError(verifier.StartChangeStream(ctx))
 
-	_, err := suite.srcMongoClient.Database("testDb").Collection("testColl1").InsertOne(ctx, bson.D{{"_id", 1}})
+	_, err := coll1.InsertOne(ctx, bson.D{{"_id", 1}})
 	suite.Require().NoError(err)
 	_, err = suite.srcMongoClient.Database("testDb").Collection("testColl1").InsertOne(ctx, bson.D{{"_id", 2}})
 	suite.Require().NoError(err)
@@ -239,6 +253,7 @@ func (suite *IntegrationTestSuite) TestWithChangeEventsBatching() {
 		500*time.Millisecond,
 		"the verifier should flush a recheck doc after a batch",
 	)
+
 }
 
 func (suite *IntegrationTestSuite) TestEventBeforeWritesOff() {

mslices/slices.go

@@ -0,0 +1,11 @@
+package mslices
+
+// This package complements the Go standard library’s package of the
+// same name with broadly-useful tools that the standard library lacks.
+
+// Of returns a slice out of the given arguments. It’s syntactic sugar
+// to capitalize on Go’s type inference, similar to
+// [this declined feature proposal](https://github.com/golang/go/issues/47709).
+func Of[T any](pieces ...T) []T {
+	return append([]T{}, pieces...)
+}

mslices/slices_test.go

@@ -0,0 +1,27 @@
+package mslices
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+)
+
+type mySuite struct {
+	suite.Suite
+}
+
+func TestUnitTestSuite(t *testing.T) {
+	suite.Run(t, &mySuite{})
+}
+
+func (s *mySuite) Test_Of() {
+	slc := Of(12, 23, 34)
+
+	s.Assert().IsType([]int{}, slc, "expected type")
+
+	a := []int{1, 2, 3}
+	b := Of(a...)
+	a[0] = 4
+
+	s.Assert().Equal(1, b[0], "should copy slice")
+}