updates

Author: qingyang-hu

mongo/integration/cmd_monitoring_helpers_test.go

@@ -313,7 +313,7 @@ func compareStartedEvent(mt *mtest.T, expectation *expectation, id0, id1 bson.Ra
 	}
 
 	if expected.CommandName != "" && expected.CommandName != evt.CommandName {
-		return fmt.Errorf("command name mismatch; expected %s, got %s", expected.CommandName, evt.CommandName)
+		return fmt.Errorf("command name mismatch for started event; expected %s, got %s", expected.CommandName, evt.CommandName)
 	}
 	if expected.DatabaseName != "" && expected.DatabaseName != evt.DatabaseName {
 		return fmt.Errorf("database name mismatch; expected %s, got %s", expected.DatabaseName, evt.DatabaseName)
@@ -429,7 +429,7 @@ func compareSucceededEvent(mt *mtest.T, expectation *expectation) error {
 	}
 
 	if expected.CommandName != "" && expected.CommandName != evt.CommandName {
-		return fmt.Errorf("command name mismatch; expected %s, got %s", expected.CommandName, evt.CommandName)
+		return fmt.Errorf("command name mismatch for succeeded event; expected %s, got %s", expected.CommandName, evt.CommandName)
 	}
 
 	eElems, err := expected.Reply.Elements()
@@ -469,7 +469,7 @@ func compareFailedEvent(mt *mtest.T, expectation *expectation) error {
 	}
 
 	if expected.CommandName != "" && expected.CommandName != evt.CommandName {
-		return fmt.Errorf("command name mismatch; expected %s, got %s", expected.CommandName, evt.CommandName)
+		return fmt.Errorf("command name mismatch for failed event; expected %s, got %s", expected.CommandName, evt.CommandName)
 	}
 	return nil
 }

mongo/integration/mtest/mongotest.go

@@ -299,11 +299,12 @@ func (t *T) ClearMockResponses() {
 func (t *T) GetStartedEvent() *event.CommandStartedEvent {
 	// TODO(GODRIVER-2075): GetStartedEvent documents that it returns the most recent event, but actually returns the first
 	// TODO event. Update either the documentation or implementation.
-	if len(t.started) == 0 {
+	l := len(t.started)
+	if l == 0 {
 		return nil
 	}
-	e := t.started[0]
-	t.started = t.started[1:]
+	e := t.started[l-1]
+	t.started = t.started[:l-1]
 	return e
 }
 
@@ -312,11 +313,12 @@ func (t *T) GetStartedEvent() *event.CommandStartedEvent {
 func (t *T) GetSucceededEvent() *event.CommandSucceededEvent {
 	// TODO(GODRIVER-2075): GetSucceededEvent documents that it returns the most recent event, but actually returns the
 	// TODO first event. Update either the documentation or implementation.
-	if len(t.succeeded) == 0 {
+	l := len(t.succeeded)
+	if l == 0 {
 		return nil
 	}
-	e := t.succeeded[0]
-	t.succeeded = t.succeeded[1:]
+	e := t.succeeded[l-1]
+	t.succeeded = t.succeeded[:l-1]
 	return e
 }
 
@@ -325,11 +327,12 @@ func (t *T) GetSucceededEvent() *event.CommandSucceededEvent {
 func (t *T) GetFailedEvent() *event.CommandFailedEvent {
 	// TODO(GODRIVER-2075): GetFailedEvent documents that it returns the most recent event, but actually  returns the first
 	// TODO event. Update either the documentation or implementation.
-	if len(t.failed) == 0 {
+	l := len(t.failed)
+	if l == 0 {
 		return nil
 	}
-	e := t.failed[0]
-	t.failed = t.failed[1:]
+	e := t.failed[l-1]
+	t.failed = t.failed[:l-1]
 	return e
 }