Moved more classes to Legacy.

Author: rstam

src/MongoDB.Driver.Tests/Builders/CollectionOptionsBuilderTests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Builders/CollectionOptionsBuilderTests.cs

@@ -49,10 +49,15 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Builders\CollectionOptionsBuilderTests.cs" />
     <Compile Include="Builders\FieldsBuilderTests.cs" />
     <Compile Include="Builders\FieldsBuilderTypedTests.cs" />
+    <Compile Include="Builders\GeoNearOptionsBuilderTests.cs" />
+    <Compile Include="Builders\GroupByBuilderTests.cs" />
     <Compile Include="Builders\IndexKeysBuilderTests.cs" />
     <Compile Include="Builders\IndexKeysBuilderTypedTests.cs" />
+    <Compile Include="Builders\IndexOptionsBuilderTests.cs" />
+    <Compile Include="Builders\IndexOptionsBuilderTypedTests.cs" />
     <Compile Include="Builders\QueryBuilderGeoJsonIntegrationTests.cs" />
     <Compile Include="Builders\QueryBuilderTests.cs" />
     <Compile Include="Builders\SortByBuilderTests.cs" />
@@ -136,7 +141,9 @@
     <Compile Include="MongoCollectionTests.cs" />
     <Compile Include="MongoDatabaseTests.cs" />
     <Compile Include="MongoServerBuildInfoTests.cs" />
+    <Compile Include="MongoServerSettingsTests.cs" />
     <Compile Include="MongoServerTests.cs" />
+    <Compile Include="MongoUserTests.cs" />
     <Compile Include="Operations\BulkWriteOperationTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Samples\AggregationSample.cs" />

src/MongoDB.Driver.Tests/Builders/GeoNearOptionsBuilderTests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Builders/GeoNearOptionsBuilderTests.cs

@@ -16,6 +16,8 @@
 using System;
 using System.Linq;
 using System.Net.Sockets;
+using System.Security.Authentication;
+using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using NUnit.Framework;
@@ -651,5 +653,59 @@ public void TestWriteConcern()
             Assert.AreEqual(writeConcern, settings.WriteConcern);
             Assert.Throws<InvalidOperationException>(() => { settings.WriteConcern = writeConcern; });
         }
+
+        [Test]
+        public void ToClusterKey_should_copy_relevant_values()
+        {
+            var credentials = new[] { MongoCredential.CreateMongoCRCredential("source", "username", "password") };
+            var servers = new[] { new MongoServerAddress("localhost") };
+            var sslSettings = new SslSettings
+            {
+                CheckCertificateRevocation = true,
+                EnabledSslProtocols = SslProtocols.Ssl3
+            };
+
+            var subject = new MongoServerSettings
+            {
+                ConnectionMode = ConnectionMode.Direct,
+                ConnectTimeout = TimeSpan.FromSeconds(1),
+                Credentials = credentials,
+                GuidRepresentation = GuidRepresentation.Standard,
+                IPv6 = true,
+                MaxConnectionIdleTime = TimeSpan.FromSeconds(2),
+                MaxConnectionLifeTime = TimeSpan.FromSeconds(3),
+                MaxConnectionPoolSize = 10,
+                MinConnectionPoolSize = 5,
+                ReplicaSetName = "rs",
+                LocalThreshold = TimeSpan.FromMilliseconds(20),
+                Servers = servers,
+                SocketTimeout = TimeSpan.FromSeconds(4),
+                SslSettings = sslSettings,
+                UseSsl = true,
+                VerifySslCertificate = true,
+                WaitQueueSize = 20,
+                WaitQueueTimeout = TimeSpan.FromSeconds(5)
+            };
+
+            var result = subject.ToClusterKey();
+
+            result.ConnectionMode.Should().Be(subject.ConnectionMode);
+            result.ConnectTimeout.Should().Be(subject.ConnectTimeout);
+            result.Credentials.Should().Equal(subject.Credentials);
+            result.IPv6.Should().Be(subject.IPv6);
+            result.MaxConnectionIdleTime.Should().Be(subject.MaxConnectionIdleTime);
+            result.MaxConnectionLifeTime.Should().Be(subject.MaxConnectionLifeTime);
+            result.MaxConnectionPoolSize.Should().Be(subject.MaxConnectionPoolSize);
+            result.MinConnectionPoolSize.Should().Be(subject.MinConnectionPoolSize);
+            result.ReplicaSetName.Should().Be(subject.ReplicaSetName);
+            result.LocalThreshold.Should().Be(subject.LocalThreshold);
+            result.Servers.Should().Equal(subject.Servers);
+            result.SocketTimeout.Should().Be(subject.SocketTimeout);
+            result.SslSettings.Should().Be(subject.SslSettings);
+            result.UseSsl.Should().Be(subject.UseSsl);
+            result.VerifySslCertificate.Should().Be(subject.VerifySslCertificate);
+            result.WaitQueueSize.Should().Be(subject.WaitQueueSize);
+            result.WaitQueueTimeout.Should().Be(subject.WaitQueueTimeout);
+        }
     }
 }

src/MongoDB.Driver.Tests/Builders/GroupByBuilderTests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Builders/GroupByBuilderTests.cs

@@ -43,6 +43,11 @@
   <ItemGroup>
     <Compile Include="AggregateArgs.cs" />
     <Compile Include="AggregateEnumerable.cs" />
+    <Compile Include="Builders\CollectionOptionsBuilder.cs" />
+    <Compile Include="Builders\GeoHaystackSearchOptionsBuilder.cs" />
+    <Compile Include="Builders\GeoNearOptionsBuilder.cs" />
+    <Compile Include="Builders\GroupByBuilder.cs" />
+    <Compile Include="Builders\IndexOptionsBuilder.cs" />
     <Compile Include="CommandResults\CollectionStatsResult.cs" />
     <Compile Include="CommandResults\CommandResult.cs" />
     <Compile Include="CommandResults\CommandResultSerializer.cs" />
@@ -75,6 +80,13 @@
     <Compile Include="GridFS\MongoGridFSSettings.cs" />
     <Compile Include="GridFS\MongoGridFSStream.cs" />
     <Compile Include="GroupArgs.cs" />
+    <Compile Include="IMongoCollectionOptions.cs" />
+    <Compile Include="IMongoCommand.cs" />
+    <Compile Include="IMongoGeoHaystackSearchOptions.cs" />
+    <Compile Include="IMongoGeoNearOptions.cs" />
+    <Compile Include="IMongoGroupBy.cs" />
+    <Compile Include="IMongoIndexOptions.cs" />
+    <Compile Include="IMongoScope.cs" />
     <Compile Include="InsertFlags.cs" />
     <Compile Include="Linq\LinqExtensionMethods.cs" />
     <Compile Include="Linq\MongoQueryable.cs" />
@@ -90,7 +102,10 @@
     <Compile Include="MongoInsertOptions.cs" />
     <Compile Include="MongoServer.cs" />
     <Compile Include="MongoServerBuildInfo.cs" />
+    <Compile Include="MongoServerSettings.cs" />
+    <Compile Include="MongoServerState.cs" />
     <Compile Include="MongoUpdateOptions.cs" />
+    <Compile Include="MongoUser.cs" />
     <Compile Include="Operations\AddUserOperation.cs" />
     <Compile Include="Operations\AddUserUsingSystemUsersCollectionOperation.cs" />
     <Compile Include="Operations\AddUserUsingUserManagementCommandsOperation.cs" />

src/MongoDB.Driver.Tests/Builders/IndexOptionsBuilderTests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Builders/IndexOptionsBuilderTests.cs

@@ -95,7 +95,7 @@ public MongoServer(MongoServerSettings settings)
             _sequentialId = Interlocked.Increment(ref __nextSequentialId);
             // Console.WriteLine("MongoServer[{0}]: {1}", sequentialId, settings);
 
-            _cluster = ClusterRegistry.Instance.GetOrCreateCluster(_settings);
+            _cluster = ClusterRegistry.Instance.GetOrCreateCluster(_settings.ToClusterKey());
             StartTrackingServerInstances();
         }
 

src/MongoDB.Driver.Tests/Builders/IndexOptionsBuilderTypedTests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Builders/IndexOptionsBuilderTypedTests.cs

@@ -21,6 +21,7 @@
 using System.Text;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
+using MongoDB.Driver.Communication;
 using MongoDB.Driver.Core.Configuration;
 using MongoDB.Shared;
 
@@ -29,7 +30,7 @@ namespace MongoDB.Driver
     /// <summary>
     /// The settings used to access a MongoDB server.
     /// </summary>
-    public class MongoServerSettings : IEquatable<MongoServerSettings>
+    public class MongoServerSettings : IEquatable<MongoServerSettings>, IInheritableMongoClientSettings
     {
         // private fields
         private Action<ClusterBuilder> _clusterConfigurator;
@@ -773,5 +774,29 @@ public override string ToString()
             }
             return string.Join(",", parts.ToArray());
         }
+
+        // internal methods
+        internal ClusterKey ToClusterKey()
+        {
+            return new ClusterKey(
+                _clusterConfigurator,
+                _connectionMode,
+                _connectTimeout,
+                _credentials.ToList(),
+                _ipv6,
+                _localThreshold,
+                _maxConnectionIdleTime,
+                _maxConnectionLifeTime,
+                _maxConnectionPoolSize,
+                _minConnectionPoolSize,
+                _replicaSetName,
+                _servers.ToList(),
+                _socketTimeout,
+                _sslSettings,
+                _useSsl,
+                _verifySslCertificate,
+                _waitQueueSize,
+                _waitQueueTimeout);
+        }
     }
 }

src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests.csproj

@@ -28,116 +28,6 @@ namespace MongoDB.Driver.Tests.Communication.Security
     [TestFixture]
     public class ClusterKeyTests
     {
-        [Test]
-        public void Constructor_with_MongoClientSettings_parameter_should_copy_relevant_values()
-        {
-            var credentials = new[] { MongoCredential.CreateMongoCRCredential("source", "username", "password") };
-            var servers = new[] { new MongoServerAddress("localhost") };
-
-            var sslSettings = new SslSettings
-            {
-                CheckCertificateRevocation = true,
-                EnabledSslProtocols = SslProtocols.Ssl3
-            };
-
-            var clientSettings = new MongoClientSettings
-            {
-                ConnectionMode = ConnectionMode.Direct,
-                ConnectTimeout = TimeSpan.FromSeconds(1),
-                Credentials = credentials,
-                GuidRepresentation = GuidRepresentation.Standard,
-                IPv6 = true,
-                MaxConnectionIdleTime = TimeSpan.FromSeconds(2),
-                MaxConnectionLifeTime = TimeSpan.FromSeconds(3),
-                MaxConnectionPoolSize = 10,
-                MinConnectionPoolSize = 5,
-                ReplicaSetName = "rs",
-                LocalThreshold = TimeSpan.FromMilliseconds(20),
-                Servers = servers,
-                SocketTimeout = TimeSpan.FromSeconds(4),
-                SslSettings = sslSettings,
-                UseSsl = true,
-                VerifySslCertificate = true,
-                WaitQueueSize = 20,
-                WaitQueueTimeout = TimeSpan.FromSeconds(5)
-            };
-
-            var subject = new ClusterKey(clientSettings);
-
-            subject.ConnectionMode.Should().Be(clientSettings.ConnectionMode);
-            subject.ConnectTimeout.Should().Be(clientSettings.ConnectTimeout);
-            subject.Credentials.Should().Equal(clientSettings.Credentials);
-            subject.IPv6.Should().Be(clientSettings.IPv6);
-            subject.MaxConnectionIdleTime.Should().Be(clientSettings.MaxConnectionIdleTime);
-            subject.MaxConnectionLifeTime.Should().Be(clientSettings.MaxConnectionLifeTime);
-            subject.MaxConnectionPoolSize.Should().Be(clientSettings.MaxConnectionPoolSize);
-            subject.MinConnectionPoolSize.Should().Be(clientSettings.MinConnectionPoolSize);
-            subject.ReplicaSetName.Should().Be(clientSettings.ReplicaSetName);
-            subject.LocalThreshold.Should().Be(clientSettings.LocalThreshold);
-            subject.Servers.Should().Equal(clientSettings.Servers);
-            subject.SocketTimeout.Should().Be(clientSettings.SocketTimeout);
-            subject.SslSettings.Should().Be(clientSettings.SslSettings);
-            subject.UseSsl.Should().Be(clientSettings.UseSsl);
-            subject.VerifySslCertificate.Should().Be(clientSettings.VerifySslCertificate);
-            subject.WaitQueueSize.Should().Be(clientSettings.WaitQueueSize);
-            subject.WaitQueueTimeout.Should().Be(clientSettings.WaitQueueTimeout);
-        }
-
-        [Test]
-        public void Constructor_with_MongoServerSettings_parameter_should_copy_relevant_values()
-        {
-            var credentials = new[] { MongoCredential.CreateMongoCRCredential("source", "username", "password") };
-            var servers = new[] { new MongoServerAddress("localhost") };
-
-            var sslSettings = new SslSettings
-            {
-                CheckCertificateRevocation = true,
-                EnabledSslProtocols = SslProtocols.Ssl3
-            };
-
-            var serverSettings = new MongoServerSettings
-            {
-                ConnectionMode = ConnectionMode.Direct,
-                ConnectTimeout = TimeSpan.FromSeconds(1),
-                Credentials = credentials,
-                GuidRepresentation = GuidRepresentation.Standard,
-                IPv6 = true,
-                MaxConnectionIdleTime = TimeSpan.FromSeconds(2),
-                MaxConnectionLifeTime = TimeSpan.FromSeconds(3),
-                MaxConnectionPoolSize = 10,
-                MinConnectionPoolSize = 5,
-                ReplicaSetName = "rs",
-                LocalThreshold = TimeSpan.FromMilliseconds(20),
-                Servers = servers,
-                SocketTimeout = TimeSpan.FromSeconds(4),
-                SslSettings = sslSettings,
-                UseSsl = true,
-                VerifySslCertificate = true,
-                WaitQueueSize = 20,
-                WaitQueueTimeout = TimeSpan.FromSeconds(5)
-            };
-
-            var subject = new ClusterKey(serverSettings);
-
-            subject.ConnectionMode.Should().Be(serverSettings.ConnectionMode);
-            subject.ConnectTimeout.Should().Be(serverSettings.ConnectTimeout);
-            subject.Credentials.Should().Equal(serverSettings.Credentials);
-            subject.IPv6.Should().Be(serverSettings.IPv6);
-            subject.MaxConnectionIdleTime.Should().Be(serverSettings.MaxConnectionIdleTime);
-            subject.MaxConnectionLifeTime.Should().Be(serverSettings.MaxConnectionLifeTime);
-            subject.MaxConnectionPoolSize.Should().Be(serverSettings.MaxConnectionPoolSize);
-            subject.MinConnectionPoolSize.Should().Be(serverSettings.MinConnectionPoolSize);
-            subject.ReplicaSetName.Should().Be(serverSettings.ReplicaSetName);
-            subject.LocalThreshold.Should().Be(serverSettings.LocalThreshold);
-            subject.Servers.Should().Equal(serverSettings.Servers);
-            subject.SocketTimeout.Should().Be(serverSettings.SocketTimeout);
-            subject.SslSettings.Should().Be(serverSettings.SslSettings);
-            subject.UseSsl.Should().Be(serverSettings.UseSsl);
-            subject.VerifySslCertificate.Should().Be(serverSettings.VerifySslCertificate);
-            subject.WaitQueueSize.Should().Be(serverSettings.WaitQueueSize);
-            subject.WaitQueueTimeout.Should().Be(serverSettings.WaitQueueTimeout);
-        }
-
         [Test]
         public void Equals_should_return_true_if_all_fields_are_equal()
         {
@@ -242,7 +132,7 @@ private ClusterKey CreateSubject(string notEqualFieldName = null)
                 WaitQueueTimeout = waitQueueTimeout
             };
 
-            return new ClusterKey(clientSettings);
+            return clientSettings.ToClusterKey();
         }
     }
 }

src/MongoDB.Driver.Tests/MongoServerSettingsTests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/MongoServerSettingsTests.cs

@@ -75,7 +75,7 @@ public void GetOrCreateCluster_should_return_a_cluster_with_the_correct_settings
 
             var subject = new ClusterRegistry();
 
-            using (var cluster = subject.GetOrCreateCluster(clientSettings))
+            using (var cluster = subject.GetOrCreateCluster(clientSettings.ToClusterKey()))
             {
                 var address = clientSettings.Servers.Single();
                 var endPoints = new[] { new DnsEndPoint(address.Host, address.Port) };
@@ -99,8 +99,8 @@ public void GetOrCreateCluster_should_return_a_different_cluster_if_client_setti
 
             var subject = new ClusterRegistry();
 
-            using (var cluster1 = subject.GetOrCreateCluster(clientSettings1))
-            using (var cluster2 = subject.GetOrCreateCluster(clientSettings2))
+            using (var cluster1 = subject.GetOrCreateCluster(clientSettings1.ToClusterKey()))
+            using (var cluster2 = subject.GetOrCreateCluster(clientSettings2.ToClusterKey()))
             {
                 cluster2.Should().NotBeSameAs(cluster1);
             }
@@ -114,8 +114,8 @@ public void GetOrCreateCluster_should_return_the_same_cluster_if_client_settings
 
             var subject = new ClusterRegistry();
 
-            using (var cluster1 = subject.GetOrCreateCluster(clientSettings1))
-            using (var cluster2 = subject.GetOrCreateCluster(clientSettings2))
+            using (var cluster1 = subject.GetOrCreateCluster(clientSettings1.ToClusterKey()))
+            using (var cluster2 = subject.GetOrCreateCluster(clientSettings2.ToClusterKey()))
             {
                 cluster2.Should().BeSameAs(cluster1);
             }