move to drivertest

Author: joyjwang

internal/integration/collection_test.go

@@ -19,7 +19,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/mongo/writeconcern"
 	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
-	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/integration"
+	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/drivertest"
 )
 
 const (
@@ -1820,7 +1820,7 @@ func TestCollection(t *testing.T) {
 		})
 		mt.RunOpts("insert and delete with batches", mtest.NewOptions().ClientType(mtest.Mock), func(mt *mtest.T) {
 			// grouped together because delete requires the documents to be inserted
-			maxBatchCount := int(integration.MockDescription.MaxBatchCount)
+			maxBatchCount := int(drivertest.MockDescription.MaxBatchCount)
 			numDocs := maxBatchCount + 50
 			var insertModels []mongo.WriteModel
 			var deleteModels []mongo.WriteModel
@@ -1871,7 +1871,7 @@ func TestCollection(t *testing.T) {
 			assert.True(mt, deletes > 1, "expected multiple batches, got %v", deletes)
 		})
 		mt.RunOpts("update with batches", mtest.NewOptions().ClientType(mtest.Mock), func(mt *mtest.T) {
-			maxBatchCount := int(integration.MockDescription.MaxBatchCount)
+			maxBatchCount := int(drivertest.MockDescription.MaxBatchCount)
 			numModels := maxBatchCount + 50
 			var models []mongo.WriteModel
 

internal/integration/mtest/mongotest.go

@@ -29,7 +29,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/mongo/writeconcern"
 	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"
-	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/integration"
+	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/drivertest"
 )
 
 var (
@@ -63,7 +63,7 @@ type T struct {
 	createClient      *bool
 	createCollection  *bool
 	runOn             []RunOnBlock
-	mockDeployment    *integration.MockDeployment // nil if the test is not being run against a mock
+	mockDeployment    *drivertest.MockDeployment // nil if the test is not being run against a mock
 	mockResponses     []bson.D
 	createdColls      []*Collection // collections created in this test
 	proxyDialer       *proxyDialer
@@ -662,7 +662,7 @@ func (t *T) createTestClient() {
 
 		args.PoolMonitor = nil
 
-		t.mockDeployment = integration.NewMockDeployment()
+		t.mockDeployment = drivertest.NewMockDeployment()
 		args.Deployment = t.mockDeployment
 
 		opts := mongoutil.NewOptionsLister(args, nil)

x/mongo/driver/integration/opmsg_deployment.go renamed to x/mongo/driver/drivertest/opmsg_deployment.go

@@ -4,7 +4,7 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-package integration
+package drivertest
 
 import (
 	"context"
@@ -18,7 +18,6 @@ import (
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/description"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/mnet"
-	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/topology"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/wiremessage"
 )
 
@@ -41,9 +40,6 @@ var (
 		MaxBatchCount:         maxBatchCount,
 		SessionTimeoutMinutes: &sessionTimeoutMinutes,
 		Kind:                  description.ServerKindRSPrimary,
-		WireVersion: &description.VersionRange{
-			Max: topology.SupportedWireVersions.Max,
-		},
 	}
 )
 

x/mongo/driver/integration/opmsg_deployment_test.go renamed to x/mongo/driver/drivertest/opmsg_deployment_test.go

@@ -4,7 +4,7 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-package integration
+package drivertest
 
 import (
 	"context"