updates

Author: qingyang-hu

mongo/integration/cmd_monitoring_helpers_test.go

@@ -270,14 +270,20 @@ func checkExpectations(mt *mtest.T, expectations *[]*expectation, id0, id1 bson.
 		return
 	}
 
-	startedEvents := make([]*cmdStartedEvt, len(*expectations))
-	succeededEvents := make([]*cmdSucceededEvt, len(*expectations))
-	failedEvents := make([]*cmdFailedEvt, len(*expectations))
-
-	for idx, expectation := range *expectations {
-		startedEvents[idx] = expectation.CommandStartedEvent
-		succeededEvents[idx] = expectation.CommandSucceededEvent
-		failedEvents[idx] = expectation.CommandFailedEvent
+	startedEvents := make([]*cmdStartedEvt, 0, len(*expectations))
+	succeededEvents := make([]*cmdSucceededEvt, 0, len(*expectations))
+	failedEvents := make([]*cmdFailedEvt, 0, len(*expectations))
+
+	for _, expectation := range *expectations {
+		if expectation.CommandStartedEvent != nil {
+			startedEvents = append(startedEvents, expectation.CommandStartedEvent)
+		}
+		if expectation.CommandSucceededEvent != nil {
+			succeededEvents = append(succeededEvents, expectation.CommandSucceededEvent)
+		}
+		if expectation.CommandFailedEvent != nil {
+			failedEvents = append(failedEvents, expectation.CommandFailedEvent)
+		}
 	}
 
 	var err error
@@ -310,9 +316,6 @@ func compareStartedEvents(mt *mtest.T, expectations []*cmdStartedEvt, id0, id1 b
 	}
 
 	compare := func(expected *cmdStartedEvt) error {
-		if expected == nil {
-			return nil
-		}
 		if len(expected.Extra) > 0 {
 			return fmt.Errorf("unrecognized fields for CommandStartedEvent: %v", expected.Extra)
 		}
@@ -450,9 +453,6 @@ func compareSucceededEvents(mt *mtest.T, expectations []*cmdSucceededEvt) error
 	}
 
 	compare := func(expected *cmdSucceededEvt) error {
-		if expected == nil {
-			return nil
-		}
 		if len(expected.Extra) > 0 {
 			return fmt.Errorf("unrecognized fields for CommandSucceededEvent: %v", expected.Extra)
 		}
@@ -514,9 +514,6 @@ func compareFailedEvents(mt *mtest.T, expectations []*cmdFailedEvt) error {
 	}
 
 	compare := func(expected *cmdFailedEvt) error {
-		if expected == nil {
-			return nil
-		}
 		if len(expected.Extra) > 0 {
 			return fmt.Errorf("unrecognized fields for CommandFailedEvent: %v", expected.Extra)
 		}