CSHARP-2459: Handle ssl option correctly also when mongodb+srv is used.

Author: rstam

README.md

@@ -89,6 +89,7 @@ Please see our [guidelines](CONTRIBUTING.md) for contributing to the driver.
 * Bar Arnon                 https://github.com/I3arnon
 * Wan Bachtiar              https://github.com/sindbach
 * Mark Benvenuto            https://github.com/markbenvenuto
+* Ethan Celletti            https://github.com/Gekctek
 * Bit Diffusion Limited     [email protected]
 * Nima Boscarino            https://github.com/NimaBoscarino
 * Oscar Bralo               https://github.com/Oscarbralo

src/MongoDB.Driver/MongoUrlBuilder.cs

@@ -793,9 +793,19 @@ public override string ToString()
             {
                 query.AppendFormat("ipv6=true;");
             }
-            if (_useSsl)
+            if (_scheme == ConnectionStringScheme.MongoDBPlusSrv)
             {
-                query.AppendFormat("ssl=true;");
+                if (!_useSsl)
+                {
+                    query.AppendFormat("ssl=false;");
+                }
+            }
+            else
+            {
+                if (_useSsl)
+                {
+                    query.AppendFormat("ssl=true;");
+                }
             }
             if (!_verifySslCertificate)
             {

tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs

@@ -1206,13 +1206,23 @@ public void TestWTimeout_Range()
             builder.WTimeout = TimeSpan.FromSeconds(1);
         }
 
-        [Fact]
-        public void TestToString_WithSrvSpecified_ParsedSameConnectionString()
-        {
-            const string connectionString = "mongodb+srv://localhost";
-            var builder = new MongoUrlBuilder(connectionString);
-            var builder2 = new MongoUrlBuilder(builder.ToString());
-            Assert.Equal(builder.ToString(), builder2.ToString());
+        [Theory]
+        [InlineData("mongodb://localhost", "mongodb://localhost")]
+        [InlineData("mongodb://localhost/?ssl=false", "mongodb://localhost")]
+        [InlineData("mongodb://localhost/?ssl=true", "mongodb://localhost/?ssl=true")]
+        [InlineData("mongodb://localhost:27018", "mongodb://localhost:27018")]
+        [InlineData("mongodb://localhost:27018/?ssl=false", "mongodb://localhost:27018")]
+        [InlineData("mongodb://localhost:27018/?ssl=true", "mongodb://localhost:27018/?ssl=true")]
+        [InlineData("mongodb+srv://localhost", "mongodb+srv://localhost")]
+        [InlineData("mongodb+srv://localhost/?ssl=false", "mongodb+srv://localhost/?ssl=false")]
+        [InlineData("mongodb+srv://localhost/?ssl=true", "mongodb+srv://localhost")]
+        public void ToString_should_return_expected_result_for_scheme_port_and_ssl(string connectionString, string expectedResult)
+        {
+            var subject = new MongoUrlBuilder(connectionString);
+
+            var result = subject.ToString();
+
+            result.Should().Be(expectedResult);
         }
 
         // private methods