CSHARP-4447: Standardize on how tests are run against both LINQ providers.

rstam · rstam · commit 985e39ded3f1 · 2023-01-04T17:39:28.000-08:00
diff --git a/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs
@@ -59,9 +59,9 @@ public void Aggregate_should_return_expected_result(
         [ParameterAttributeData]
         public void AsQueryable_should_return_expected_result(
             [Values(false, true)] bool withSession,
-            [Values(2, 3)] int linqVersion)
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
         {
-            var collection = CreateMockCollection(linqVersion).Object;
+            var collection = CreateMockCollection(linqProvider).Object;
             var session = withSession ? Mock.Of<IClientSessionHandle>() : null;
             var options = new AggregateOptions();
 
@@ -75,16 +75,15 @@ public void AsQueryable_should_return_expected_result(
                 result = collection.AsQueryable(options);
             }
 
-            if (linqVersion == 2)
+            if (linqProvider == LinqProvider.V2)
             {
                 var queryable = result.Should().BeOfType<Driver.Linq.Linq2Implementation.MongoQueryableImpl<Person, Person>>().Subject;
                 var provider = queryable.Provider.Should().BeOfType<Driver.Linq.Linq2Implementation.MongoQueryProviderImpl<Person>>().Subject;
                 provider._collection().Should().BeSameAs(collection);
                 provider._options().Should().BeSameAs(options);
                 provider._session().Should().BeSameAs(session);
             }
-
-            if (linqVersion == 3)
+            else
             {
                 var queryable = result.Should().BeOfType<Driver.Linq.Linq3Implementation.MongoQuery<Person, Person>>().Subject;
                 var provider = queryable.Provider.Should().BeOfType<Driver.Linq.Linq3Implementation.MongoQueryProvider<Person>>().Subject;
@@ -1234,15 +1233,9 @@ public void Watch_should_call_collection_with_expected_arguments(
             }
         }
 
-        private Mock<IMongoCollection<Person>> CreateMockCollection(int linqVersion = 2)
+        private Mock<IMongoCollection<Person>> CreateMockCollection(LinqProvider linqProvider = LinqProvider.V2)
         {
             var mockClient = new Mock<IMongoClient>();
-            var linqProvider = linqVersion switch
-            {
-                2 => LinqProvider.V2,
-                3 => LinqProvider.V3,
-                _ => throw new ArgumentException($"Invalid linqVersion: {linqVersion}.", nameof(linqVersion))
-            };
             var clientSettings = new MongoClientSettings { LinqProvider = linqProvider };
             mockClient.SetupGet(c => c.Settings).Returns(clientSettings);
 
diff --git a/tests/MongoDB.Driver.Tests/Jira/CSharp4172Tests.cs b/tests/MongoDB.Driver.Tests/Jira/CSharp4172Tests.cs
@@ -22,16 +22,17 @@
 using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver.Linq;
 using MongoDB.Driver.Tests.Linq.Linq3ImplementationTests;
+using MongoDB.TestHelpers.XunitExtensions;
 using Xunit;
 
 namespace MongoDB.Driver.Tests.Jira
 {
     public class CSharp4172Tests : Linq3IntegrationTest
     {
         [Theory]
-        [InlineData(LinqProvider.V2)]
-        [InlineData(LinqProvider.V3)]
-        public void Find_uses_the_expected_serializer(LinqProvider linqProvider)
+        [ParameterAttributeData]
+        public void Find_uses_the_expected_serializer(
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
         {
             var collection = GetCollection<Order>(null, null, linqProvider);
 
@@ -43,9 +44,9 @@ public void Find_uses_the_expected_serializer(LinqProvider linqProvider)
         }
 
         [Theory]
-        [InlineData(LinqProvider.V2)]
-        [InlineData(LinqProvider.V3)]
-        public void Aggregate_uses_the_expected_serializer(LinqProvider linqProvider)
+        [ParameterAttributeData]
+        public void Aggregate_uses_the_expected_serializer(
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
         {
             var collection = GetCollection<Order>(null, null, linqProvider);
 
diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4079Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4079Tests.cs
@@ -28,15 +28,14 @@ public class CSharp4079Tests : Linq3IntegrationTest
         [Theory]
         [ParameterAttributeData]
         public void Positional_operator_with_negative_one_array_index_should_work_or_throw_depending_on_Linq_provider(
-            [Values(false, true)] bool useLinq2)
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
         {
-            var linqProvider = useLinq2 ? LinqProvider.V2 : LinqProvider.V3;
             var collection = GetCollection<C>();
 
             var negativeOne = -1;
             var update = Builders<C>.Update.Set(x => x.A[negativeOne], 0); // using -1 constant is a compile time error
 
-            if (useLinq2)
+            if (linqProvider == LinqProvider.V2)
             {
                 var rendered = Render(update, linqProvider);
                 rendered.Should().Be("{ $set : { 'A.$' : 0 } }");
@@ -51,14 +50,13 @@ public void Positional_operator_with_negative_one_array_index_should_work_or_thr
         [Theory]
         [ParameterAttributeData]
         public void Positional_operator_with_negative_one_ElementAt_should_work_or_throw_depending_on_Linq_provider(
-            [Values(false, true)] bool useLinq2)
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
         {
-            var linqProvider = useLinq2 ? LinqProvider.V2 : LinqProvider.V3;
             var collection = GetCollection<C>();
 
             var update = Builders<C>.Update.Set(x => x.A.ElementAt(-1), 0);
 
-            if (useLinq2)
+            if (linqProvider == LinqProvider.V2)
             {
                 var rendered = Render(update, linqProvider);
                 rendered.Should().Be("{ $set : { 'A.$' : 0 } }");
diff --git a/tests/MongoDB.Driver.Tests/Samples/AggregationSample.cs b/tests/MongoDB.Driver.Tests/Samples/AggregationSample.cs
@@ -105,9 +105,9 @@ public async Task States_with_pops_over_20000_queryable_method(
 
 #if !MONO
         [Theory]
-        [InlineData(LinqProvider.V2)]
-        [InlineData(LinqProvider.V3)]
-        public void States_with_pops_over_20000_queryable_syntax(LinqProvider linqProvider)
+        [ParameterAttributeData]
+        public void States_with_pops_over_20000_queryable_syntax(
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
         {
             var client = DriverTestConfiguration.GetLinqClient(linqProvider);
             var database = client.GetDatabase(__collection.CollectionNamespace.DatabaseNamespace.DatabaseName);

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ public void Aggregate_should_return_expected_result(`
`59`	`59`	`[ParameterAttributeData]`
`60`	`60`	`public void AsQueryable_should_return_expected_result(`
`61`	`61`	`[Values(false, true)] bool withSession,`
`62`		`- [Values(2, 3)] int linqVersion)`
	`62`	`+ [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)`
`63`	`63`	`{`
`64`		`- var collection = CreateMockCollection(linqVersion).Object;`
	`64`	`+ var collection = CreateMockCollection(linqProvider).Object;`
`65`	`65`	`var session = withSession ? Mock.Of<IClientSessionHandle>() : null;`
`66`	`66`	`var options = new AggregateOptions();`
`67`	`67`
`@@ -75,16 +75,15 @@ public void AsQueryable_should_return_expected_result(`
`75`	`75`	`result = collection.AsQueryable(options);`
`76`	`76`	`}`
`77`	`77`
`78`		`- if (linqVersion == 2)`
	`78`	`+ if (linqProvider == LinqProvider.V2)`
`79`	`79`	`{`
`80`	`80`	`var queryable = result.Should().BeOfType<Driver.Linq.Linq2Implementation.MongoQueryableImpl<Person, Person>>().Subject;`
`81`	`81`	`var provider = queryable.Provider.Should().BeOfType<Driver.Linq.Linq2Implementation.MongoQueryProviderImpl<Person>>().Subject;`
`82`	`82`	`provider._collection().Should().BeSameAs(collection);`
`83`	`83`	`provider._options().Should().BeSameAs(options);`
`84`	`84`	`provider._session().Should().BeSameAs(session);`
`85`	`85`	`}`
`86`		`-`
`87`		`- if (linqVersion == 3)`
	`86`	`+ else`
`88`	`87`	`{`
`89`	`88`	`var queryable = result.Should().BeOfType<Driver.Linq.Linq3Implementation.MongoQuery<Person, Person>>().Subject;`
`90`	`89`	`var provider = queryable.Provider.Should().BeOfType<Driver.Linq.Linq3Implementation.MongoQueryProvider<Person>>().Subject;`
`@@ -1234,15 +1233,9 @@ public void Watch_should_call_collection_with_expected_arguments(`
`1234`	`1233`	`}`
`1235`	`1234`	`}`
`1236`	`1235`
`1237`		`- private Mock<IMongoCollection<Person>> CreateMockCollection(int linqVersion = 2)`
	`1236`	`+ private Mock<IMongoCollection<Person>> CreateMockCollection(LinqProvider linqProvider = LinqProvider.V2)`
`1238`	`1237`	`{`
`1239`	`1238`	`var mockClient = new Mock<IMongoClient>();`
`1240`		`- var linqProvider = linqVersion switch`
`1241`		`- {`
`1242`		`- 2 => LinqProvider.V2,`
`1243`		`- 3 => LinqProvider.V3,`
`1244`		`- _ => throw new ArgumentException($"Invalid linqVersion: {linqVersion}.", nameof(linqVersion))`
`1245`		`- };`
`1246`	`1239`	`var clientSettings = new MongoClientSettings { LinqProvider = linqProvider };`
`1247`	`1240`	`mockClient.SetupGet(c => c.Settings).Returns(clientSettings);`
`1248`	`1241`
Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,17 @@`
`22`	`22`	`using MongoDB.Bson.Serialization.Serializers;`
`23`	`23`	`using MongoDB.Driver.Linq;`
`24`	`24`	`using MongoDB.Driver.Tests.Linq.Linq3ImplementationTests;`
	`25`	`+using MongoDB.TestHelpers.XunitExtensions;`
`25`	`26`	`using Xunit;`
`26`	`27`
`27`	`28`	`namespace MongoDB.Driver.Tests.Jira`
`28`	`29`	`{`
`29`	`30`	`public class CSharp4172Tests : Linq3IntegrationTest`
`30`	`31`	`{`
`31`	`32`	`[Theory]`
`32`		`- [InlineData(LinqProvider.V2)]`
`33`		`- [InlineData(LinqProvider.V3)]`
`34`		`- public void Find_uses_the_expected_serializer(LinqProvider linqProvider)`
	`33`	`+ [ParameterAttributeData]`
	`34`	`+ public void Find_uses_the_expected_serializer(`
	`35`	`+ [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)`
`35`	`36`	`{`
`36`	`37`	`var collection = GetCollection<Order>(null, null, linqProvider);`
`37`	`38`
`@@ -43,9 +44,9 @@ public void Find_uses_the_expected_serializer(LinqProvider linqProvider)`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`[Theory]`
`46`		`- [InlineData(LinqProvider.V2)]`
`47`		`- [InlineData(LinqProvider.V3)]`
`48`		`- public void Aggregate_uses_the_expected_serializer(LinqProvider linqProvider)`
	`47`	`+ [ParameterAttributeData]`
	`48`	`+ public void Aggregate_uses_the_expected_serializer(`
	`49`	`+ [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)`
`49`	`50`	`{`
`50`	`51`	`var collection = GetCollection<Order>(null, null, linqProvider);`
`51`	`52`