Remove unified test for UpdateMany.

mongo/integration/collection_test.go

@@ -640,6 +640,17 @@ func TestCollection(t *testing.T) {
  assert.Equal(mt, int64(0), res.ModifiedCount, "expected modified count 0, got %v", res.ModifiedCount)
  assert.NotNil(mt, res.UpsertedID, "expected upserted ID, got nil")
  })
+ // Require 8.0 servers for sort support.
+ mt.RunOpts("error with sort", mtest.NewOptions().MinServerVersion("8.0"), func(mt *mtest.T) {
+ filter := bson.D{{"x", bson.D{{"$gte", 3}}}}
+ update := bson.D{{"$inc", bson.D{{"x", 1}}}}
+
+ _, err := mt.Coll.UpdateMany(context.Background(),
+ filter, update,
+ &options.UpdateOptions{Sort: bson.D{{"_id", -1}}},
+ )
+ assert.EqualError(t, err, "Cannot specify sort with multi=true", "expected an error on UpdateMany with sort")
+ })
  mt.Run("write error", func(mt *mtest.T) {
  filter := bson.D{{"_id", "foo"}}
  update := bson.D{{"$set", bson.D{{"_id", 3.14159}}}}

mongo/integration/crud_helpers_test.go

@@ -80,20 +80,6 @@ func createHint(mt *mtest.T, val bson.RawValue) interface{} {
  return hint
 }
 
-// create a sort document from a bson.RawValue
-func createSort(mt *mtest.T, val bson.RawValue) interface{} {
- mt.Helper()
-
- var sort interface{}
- switch val.Type {
- case bsontype.EmbeddedDocument:
- sort = val.Document()
- default:
- mt.Fatalf("unrecognized sort value type: %s\n", val.Type)
- }
- return sort
-}
-
 // returns true if err is a mongo.CommandError containing a code that is expected from a killAllSessions command.
 func isExpectedKillAllSessionsError(err error) bool {
  cmdErr, ok := err.(mongo.CommandError)
@@ -904,8 +890,6 @@ func executeUpdateOne(mt *mtest.T, sess mongo.Session, args bson.Raw) (*mongo.Up
  opts = opts.SetCollation(createCollation(mt, val.Document()))
  case "hint":
  opts = opts.SetHint(createHint(mt, val))
- case "sort":
- opts = opts.SetSort(createSort(mt, val))
  case "session":
  default:
  mt.Fatalf("unrecognized updateOne option: %v", key)
@@ -954,8 +938,6 @@ func executeUpdateMany(mt *mtest.T, sess mongo.Session, args bson.Raw) (*mongo.U
  opts = opts.SetCollation(createCollation(mt, val.Document()))
  case "hint":
  opts = opts.SetHint(createHint(mt, val))
- case "sort":
- opts = opts.SetSort(createSort(mt, val))
  case "session":
  default:
  mt.Fatalf("unrecognized updateMany option: %v", key)
@@ -1000,8 +982,6 @@ func executeReplaceOne(mt *mtest.T, sess mongo.Session, args bson.Raw) (*mongo.U
  opts = opts.SetCollation(createCollation(mt, val.Document()))
  case "hint":
  opts = opts.SetHint(createHint(mt, val))
- case "sort":
- opts = opts.SetSort(createSort(mt, val))
  case "session":
  default:
  mt.Fatalf("unrecognized replaceOne option: %v", key)
@@ -1142,9 +1122,6 @@ func createBulkWriteModel(mt *mtest.T, rawModel bson.Raw) mongo.WriteModel {
  if hintVal, err := args.LookupErr("hint"); err == nil {
  uom.SetHint(createHint(mt, hintVal))
  }
- if sortVal, err := args.LookupErr("sort"); err == nil {
- uom.SetSort(createSort(mt, sortVal))
- }
  if uom.Upsert == nil {
  uom.SetUpsert(false)
  }